diff options
| -rwxr-xr-x | baserock-bootstrap | 4 | ||||
| -rwxr-xr-x | mkimage.sh | 2 | ||||
| -rw-r--r-- | morphlib/bins.py | 2 | ||||
| -rw-r--r-- | morphlib/builder.py | 2 | ||||
| -rwxr-xr-x | run-bootstrap-in-chroot | 4 | ||||
| -rwxr-xr-x | tests/name-clash.script | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap index d0bb4d5d..ccc96dd4 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -62,7 +62,7 @@ unpack() if [ ! -e "$sources/$1" ] then echo "Unpacking" "$sources/$1"*.tar.* - time tar -C "$sources" -xf "$sources/$1"*.tar.* + time tar -C "$sources" -xhf "$sources/$1"*.tar.* fi } @@ -949,7 +949,7 @@ pass2_build_devel_system_outside_chroot() for stratum in \ "$LFS"/baserock/cache/*.stratum.{foundation,linux-stratum,devel} do - $HOST_SUDO tar -C "$mp" -xf "$stratum" + $HOST_SUDO tar -C "$mp" -xhf "$stratum" done cat <<EOF | $HOST_SUDO tee "$mp/etc/fstab" @@ -108,7 +108,7 @@ trap "umount $part; dummy_kpartx_delete $img" EXIT # Unpack all the strata that are to be installed. for stratum do - tar -C "$mp" -xf "$stratum" + tar -C "$mp" -xhf "$stratum" done # Configure fstab for the new system. diff --git a/morphlib/bins.py b/morphlib/bins.py index b6201756..fd0f28d4 100644 --- a/morphlib/bins.py +++ b/morphlib/bins.py @@ -109,5 +109,5 @@ def unpack_binary(filename, dirname, ex): ''' logging.debug('Unpacking %s into %s' % (filename, dirname)) - ex.runv(['tar', '-C', dirname, '-xvf', filename]) + ex.runv(['tar', '-C', dirname, '-xvhf', filename]) diff --git a/morphlib/builder.py b/morphlib/builder.py index bf607d34..c3e71c09 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -494,7 +494,7 @@ class SystemBuilder(BlobBuilder): # pragma: no cover with self.build_watch('unpack-strata'): for name, filename in self.stage_items: self.msg('unpack %s from %s' % (name, filename)) - self.ex.runv(['tar', '-C', mount_point, '-xf', filename]) + self.ex.runv(['tar', '-C', mount_point, '-xhf', filename]) ldconfig(self.ex, mount_point) def _create_fstab(self, mount_point): diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 6c736b4d..9a669015 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -42,7 +42,7 @@ run_pass() if "$snapshot" && has_pass "$passname" then - tar -C "$dir" -xf "$tarball" + tar -C "$dir" -xhf "$tarball" update_morph "$dir" else update_morph "$dir" @@ -112,7 +112,7 @@ mkdir "$dir" chrootsnapshot="$snapshotdir/squeeze.tar.gz" if "$snapshot" && [ -e "$chrootsnapshot" ] then - tar -C "$dir" -xf "$chrootsnapshot" + tar -C "$dir" -xhf "$chrootsnapshot" else debootstrap \ --include=build-essential,\ diff --git a/tests/name-clash.script b/tests/name-clash.script index 8f762a3e..ce9ec051 100755 --- a/tests/name-clash.script +++ b/tests/name-clash.script @@ -65,5 +65,5 @@ EOF # unpack it and check the contents INSTDIR="$DATADIR"/unpack mkdir -p "$INSTDIR" -tar -C "$INSTDIR" -xf "$cache/"*hello-stratum* +tar -C "$INSTDIR" -xhf "$cache/"*hello-stratum* test "$("$INSTDIR"/bin/hello)" = "hello, world" |