[Debian-live-changes] r2442 - in dists/trunk/live-helper: docs functions

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-09 16:02:00 +0000 (Mon, 09 Jul 2007)
New Revision: 2442

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/chroot.sh
   dists/trunk/live-helper/functions/defaults.sh
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-09 16:01:36 UTC (rev 2441)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-09 16:02:00 UTC (rev 2442)
@@ -1,4 +1,5 @@
 2007-07-09  Chris Lamb  <chris at chris-lamb.co.uk>
+
 	* functions/chroot.sh, functions/defaults.sh:
 	  - Altered LH_DEBCONF_NOWARNINGS so that it accepts "enabled/disabled"
 	  as well as "yes/no" for consistency.

Modified: dists/trunk/live-helper/functions/chroot.sh
===================================================================
--- dists/trunk/live-helper/functions/chroot.sh	2007-07-09 16:01:36 UTC (rev 2441)
+++ dists/trunk/live-helper/functions/chroot.sh	2007-07-09 16:02:00 UTC (rev 2442)
@@ -13,22 +13,9 @@
 {
 	COMMANDS="${1}"
 
-	case "${LH_DEBCONF_NOWARNINGS}" in
-		"disabled")
-			DEBCONF_NOWARNINGS="no"
-			;;
-		"no")
-			DEBCONF_NOWARNINGS="no"
-			;;
-		*)
-			DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
-			;;
-	esac
-
-	echo 
 	# Executing commands in chroot
 	Echo_debug "Executing: ${COMMANDS}"
-	${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${DEBCONF_NOWARNINGS}" ${COMMANDS}
+	${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS}
 
 	return "${?}"
 }

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-07-09 16:01:36 UTC (rev 2441)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-07-09 16:02:00 UTC (rev 2442)
@@ -128,9 +128,19 @@
 
 	# Setting debconf frontend
 	LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND:-noninteractive}"
-	LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-enabled}"
+	LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-yes}"
 	LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY:-critical}"
 
+	case "${LH_DEBCONF_NOWARNINGS}" in
+		enabled)
+			LH_DEBCONF_NOWARNINGS="yes"
+			;;
+
+		disabled)
+			LH_DEBCONF_NOWARNINGS="no"
+			;;
+	esac
+
 	# Setting genisoimage
 	if [ -z "${LH_GENISOIMAGE}" ]
 	then