diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-31 09:26:25 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-31 09:26:25 +0100 |
| commit | 4f710bc3c44c59a9f34ec4fd8c5790df25524606 (patch) | |
| tree | 62f3ce083bbb3edb3a614cfca57a624609a3f3ea /functions | |
| parent | 3718d0db96e312d8476150eb2d97ea23a73f201b (diff) | |
| download | vyos-live-build-4f710bc3c44c59a9f34ec4fd8c5790df25524606.tar.gz vyos-live-build-4f710bc3c44c59a9f34ec4fd8c5790df25524606.zip | |
Removing debconf-nowarnings option, doesn't provide any advantage to disable this option in the first place.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/chroot.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh index b0895a3f0..d8cd175b3 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -28,7 +28,7 @@ Chroot () if [ "${LB_USE_FAKEROOT}" != "true" ] then - ${LB_ROOT_COMMAND} ${_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="${LB_DEBCONF_NOWARNINGS}" ${ENV} ${COMMANDS} + ${LB_ROOT_COMMAND} ${_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 ${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${ENV} ${COMMANDS} diff --git a/functions/defaults.sh b/functions/defaults.sh index d2c84c4c3..89c02d8eb 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -170,19 +170,8 @@ Set_defaults () # Setting debconf frontend LB_DEBCONF_FRONTEND="${LB_DEBCONF_FRONTEND:-noninteractive}" - LB_DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS:-yes}" LB_DEBCONF_PRIORITY="${LB_DEBCONF_PRIORITY:-critical}" - case "${LB_DEBCONF_NOWARNINGS}" in - true) - LB_DEBCONF_NOWARNINGS="yes" - ;; - - false) - LB_DEBCONF_NOWARNINGS="no" - ;; - esac - # Setting initramfs hook case "${LB_SYSTEM}" in live) |