Preserve Linux capabilities when running tar, and misc fixes for mkrootfs. (#92)
* Preserve Linux capabilities in various tar invocations. Otherwise, ping as non-root will not work when using a Void image. Don't try to umount pseudofilesystems when $rootfs is undefined. On mktemp failure, die in the script itself, not the $( ... ) subshell. And remove the second FATAL: from the error message.
This commit is contained in:
committed by
Jürgen Buchmüller
parent
9800862806
commit
4317c1a4f6
@ -1116,15 +1116,14 @@ log_and_count() {
|
||||
}
|
||||
|
||||
copy_rootfs() {
|
||||
local tar_in="--create --one-file-system"
|
||||
local tar_out="--extract --preserve-permissions"
|
||||
local tar_in="--create --one-file-system --xattrs"
|
||||
TITLE="Check $LOG for details ..."
|
||||
INFOBOX "Counting files, please be patient ..." 4 60
|
||||
copy_total=$(tar ${tar_in} -v -f /dev/null / 2>/dev/null | wc -l)
|
||||
export copy_total copy_count=0 copy_progress=
|
||||
clear
|
||||
tar ${tar_in} -f - / 2>/dev/null | \
|
||||
tar ${tar_out} -v -f - -C $TARGETDIR | \
|
||||
tar --extract --xattrs --xattrs-include='*' --preserve-permissions -v -f - -C $TARGETDIR | \
|
||||
log_and_count | \
|
||||
DIALOG --title "${TITLE}" \
|
||||
--progressbox "Copying live image to target rootfs." 5 60
|
||||
|
Reference in New Issue
Block a user