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/bootstrap_debootstrap | |
| 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/bootstrap_debootstrap')
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index ebfd7bf61..5f7df4b09 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -101,12 +101,7 @@ then fi Echo_breakage "Running debootstrap (download-only)... " - ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" - - if [ -n "${LB_ROOT_COMMAND}" ] - then - ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot - fi + debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" # Removing old cache rm -f cache/packages.bootstrap/*.deb @@ -127,18 +122,13 @@ then fi Echo_message "Bootstrap will be foreign" - ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" + debootstrap ${DEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" Echo_message "Running debootstrap second stage under QEMU" cp ${LB_BOOTSTRAP_QEMU_STATIC} chroot/usr/bin Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage else - ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" - fi - - if [ -n "${LB_ROOT_COMMAND}" ] - then - ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot + debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" fi # Deconfiguring debootstrap configurations |