From 4f710bc3c44c59a9f34ec4fd8c5790df25524606 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 31 Oct 2012 09:26:25 +0100 Subject: Removing debconf-nowarnings option, doesn't provide any advantage to disable this option in the first place. --- functions/chroot.sh | 2 +- functions/defaults.sh | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'functions') 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) -- cgit v1.2.3