diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-02-18 11:29:04 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:06 +0200 |
| commit | 04cec317cc4437eed514f4277f6779010e587662 (patch) | |
| tree | 16e00a5358affa5a5b906f2c0d3f38d628ab0b2e /scripts/build/binary_rootfs | |
| parent | 3f3d05b2e654a4ec312cb121c991b8c010bf3db1 (diff) | |
| download | vyos-live-build-04cec317cc4437eed514f4277f6779010e587662.tar.gz vyos-live-build-04cec317cc4437eed514f4277f6779010e587662.zip | |
Removing incomplete support for root-command.
Diffstat (limited to 'scripts/build/binary_rootfs')
| -rwxr-xr-x | scripts/build/binary_rootfs | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 3dfdeb2c1..10d77c55e 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -74,12 +74,7 @@ do # Restoring old cache mkdir -p binary/"${INITFS}" - ${LB_ROOT_COMMAND} cp -a cache/binary_rootfs/filesystem.* binary/"${INITFS}" - - if [ -n "${LB_ROOT_COMMAND}" ] - then - ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary - fi + cp -a cache/binary_rootfs/filesystem.* binary/"${INITFS}" # Creating stage file Create_stagefile .build/binary_rootfs @@ -132,7 +127,7 @@ case "${LB_CHROOT_FILESYSTEM}" in Chroot chroot "mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 filesystem.${LB_CHROOT_FILESYSTEM}" mkdir -p filesystem.tmp - ${LB_ROOT_COMMAND} mount -o loop chroot/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp + mount -o loop chroot/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp cp -a chroot/chroot/* filesystem.tmp if [ "${FAKE_MTAB}" = "true" ] @@ -140,7 +135,7 @@ case "${LB_CHROOT_FILESYSTEM}" in Chroot chroot "rm -f /etc/mtab" fi - ${LB_ROOT_COMMAND} umount filesystem.tmp + umount filesystem.tmp rmdir filesystem.tmp # Move image @@ -202,10 +197,10 @@ case "${LB_CHROOT_FILESYSTEM}" in mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} mkdir -p filesystem.tmp - ${LB_ROOT_COMMAND} mount -o loop binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp + mount -o loop binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp cp -a chroot/* filesystem.tmp - ${LB_ROOT_COMMAND} umount filesystem.tmp + umount filesystem.tmp rmdir filesystem.tmp ;; esac @@ -383,8 +378,8 @@ case "${LB_CHROOT_FILESYSTEM}" in esac # Move image - ${LB_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS} - ${LB_ROOT_COMMAND} rm -f chroot/squashfs.sort + mv chroot/filesystem.squashfs binary/${INITFS} + rm -f chroot/squashfs.sort if [ -e chroot/chroot.cache ] then @@ -430,7 +425,7 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_package fi - ${LB_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs + chmod 0644 binary/${INITFS}/filesystem.squashfs ;; false) @@ -449,11 +444,6 @@ case "${LB_CHROOT_FILESYSTEM}" in ;; esac - if [ -n "${LB_ROOT_COMMAND}" ] - then - ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary/${INITFS} - fi - # Saving cache Save_cache cache/packages.binary ;; @@ -488,12 +478,7 @@ do if [ "${LB_CHROOT_FILESYSTEM}" != "none" ] then - ${LB_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/binary_rootfs - fi - - if [ -n "${LB_ROOT_COMMAND}" ] - then - ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/binary_rootfs + cp -a binary/"${INITFS}"/filesystem.* cache/binary_rootfs fi fi done |