[Debian-live-changes] r964 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-06 12:16:12 +0000 (Fri, 06 Apr 2007)
New Revision: 964

Modified:
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
   dists/trunk/live-helper/helpers/make-live
Log:


Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-06 12:14:35 UTC (rev 963)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-06 12:16:12 UTC (rev 964)
@@ -73,17 +73,17 @@
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
 fi
 
-if [ "${DEBUG}" = "true" ]
+if [ "${LH_DEBUG}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
 fi
 
-if [ "${QUIET}" = "true" ]
+if [ "${LH_QUIET}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
 fi
 
-if [ "${VERBOSE}" = "true" ]
+if [ "${LH_VERBOSE}" = "true" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
 fi

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-06 12:14:35 UTC (rev 963)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-06 12:16:12 UTC (rev 964)
@@ -66,7 +66,7 @@
 	LIVE_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LIVE_BOOTSTRAP_CONFIG}"
 fi
 
-if [ "${VERBOSE}" = "true" ]
+if [ "${LH_VERBOSE}" = "true" ]
 then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
 fi

Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live	2007-04-06 12:14:35 UTC (rev 963)
+++ dists/trunk/live-helper/helpers/make-live	2007-04-06 12:16:12 UTC (rev 964)
@@ -274,19 +274,19 @@
 				;;
 
 			--debug)
-				DEBUG="true"; shift
+				LH_DEBUG="true"; shift
 				;;
 
 			--force)
-				FORCE="true"; shift
+				LH_FORCE="true"; shift
 				;;
 
 			--quiet)
-				QUIET="true"; shift
+				LH_QUIET="true"; shift
 				;;
 
 			--verbose)
-				VERBOSE="true"; shift
+				LH_VERBOSE="true"; shift
 				;;
 
 			--)
@@ -323,22 +323,22 @@
 	# Configuring (this is really shit!)
 	LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST86="${LIVE_MEMTEST86}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" lh_config newconfig
 
-	if [ "${DEBUG}" = "true" ]
+	if [ "${LH_DEBUG}" = "true" ]
 	then
 		OPTIONS="${OPTIONS} --debug"
 	fi
 
-	if [ "${FORCE}" = "true" ]
+	if [ "${LH_FORCE}" = "true" ]
 	then
 		OPTIONS="${OPTIONS} --force"
 	fi
 
-	if [ "${QUIET}" = "true" ]
+	if [ "${LH_QUIET}" = "true" ]
 	then
 		OPTIONS="${OPTIONS} --quiet"
 	fi
 
-	if [ "${VERBOSE}" = "true" ]
+	if [ "${LH_VERBOSE}" = "true" ]
 	then
 		OPTIONS="${OPTIONS} --verbose"
 	fi