diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-02-18 13:56:07 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:06 +0200 |
| commit | dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d (patch) | |
| tree | 709a2c9331091622e6b96bb22b52410d0109ccb1 /functions | |
| parent | 04cec317cc4437eed514f4277f6779010e587662 (diff) | |
| download | vyos-live-build-dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d.tar.gz vyos-live-build-dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d.zip | |
Removing incomplete support for fakeroot.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/chroot.sh | 8 | ||||
| -rwxr-xr-x | functions/defaults.sh | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh index 901bd82ff..75ffc053e 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -26,13 +26,7 @@ Chroot () fi done - if [ "${LB_USE_FAKEROOT}" != "true" ] - then - ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NONINTERACTIVE_SEEN="true" DEBCONF_NOWARNINGS="true" ${ENV} ${COMMANDS} - else - # Building with fakeroot/fakechroot - ${_LINUX32} chroot "${CHROOT}" ${ENV} ${COMMANDS} - fi + ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NONINTERACTIVE_SEEN="true" DEBCONF_NOWARNINGS="true" ${ENV} ${COMMANDS} return "${?}" } diff --git a/functions/defaults.sh b/functions/defaults.sh index 592e5a1fc..b7390c78d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -1128,9 +1128,6 @@ Set_defaults () # Setting image type LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}" - - # Setting fakeroot/fakechroot - LB_USE_FAKEROOT="${LB_USE_FAKEROOT:-false}" } Check_defaults () |