[Debian-live-changes] r2550 - in dists/trunk/live-helper: functions helpers

daniel at alioth.debian.org daniel at alioth.debian.org
Fri Jul 20 05:44:28 UTC 2007


Author: daniel
Date: 2007-07-20 05:44:28 +0000 (Fri, 20 Jul 2007)
New Revision: 2550

Modified:
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/functions/package.sh
   dists/trunk/live-helper/helpers/lh_binary
   dists/trunk/live-helper/helpers/lh_binary_chroot
   dists/trunk/live-helper/helpers/lh_binary_encryption
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_iso
   dists/trunk/live-helper/helpers/lh_binary_memtest
   dists/trunk/live-helper/helpers/lh_binary_rootfs
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_binary_yaboot
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-07-20 05:44:28 UTC (rev 2550)
@@ -126,9 +126,6 @@
 	LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES:-enabled}"
 	LH_CACHE_STAGES="${LH_CACHE_STAGES:-bootstrap}"
 
-	# Setting chroot option
-	LH_CHROOT_BUILD="${LH_CHROOT_BUILD:-enabled}"
-
 	# Setting debconf frontend
 	LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND:-noninteractive}"
 	LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS:-yes}"
@@ -587,6 +584,9 @@
 		esac
 	fi
 
+	# Setting chroot option
+	LIVE_CHROOT_BUILD="${LIVE_CHROOT_BUILD:-enabled}"
+
 	# Setting debian-installer option
 	LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}"
 

Modified: dists/trunk/live-helper/functions/package.sh
===================================================================
--- dists/trunk/live-helper/functions/package.sh	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/functions/package.sh	2007-07-20 05:44:28 UTC (rev 2550)
@@ -14,7 +14,7 @@
 	ITEM="${1}"
 	PACKAGE="${2}"
 
-	case "${LH_CHROOT_BUILD}" in
+	case "${LIVE_CHROOT_BUILD}" in
 		enabled)
 			if [ ! -d "${ITEM}" ] && [ ! -f "${ITEM}" ]
 			then
@@ -36,7 +36,7 @@
 
 Install_package ()
 {
-	if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
+	if [ -n "${PACKAGES}" ] && [ "${LIVE_CHROOT_BUILD}" != "disabled" ]
 	then
 		case "${LH_APT}" in
 			apt|apt-get)
@@ -52,7 +52,7 @@
 
 Remove_package ()
 {
-	if [ -n "${PACKAGES}" ] && [ "${LH_CHROOT_BUILD}" != "disabled" ]
+	if [ -n "${PACKAGES}" ] && [ "${LIVE_CHROOT_BUILD}" != "disabled" ]
 	then
 		case "${LH_APT}" in
 			apt|apt-get)

Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary	2007-07-20 05:44:28 UTC (rev 2550)
@@ -27,7 +27,7 @@
 # Preparing root filesystem
 lh_binary_chroot ${*}
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LIVE_CHROOT_BUILD}" = "enabled" ]
 then
 	# Configuring chroot
 	lh_chroot_proc install ${*}
@@ -62,7 +62,7 @@
 lh_binary_tar ${*}
 lh_binary_usb-hdd ${*}
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LIVE_CHROOT_BUILD}" = "enabled" ]
 then
 	# Deconfiguring chroot
 	rm -f .stage/chroot_sources

Modified: dists/trunk/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary_chroot	2007-07-20 05:44:28 UTC (rev 2550)
@@ -58,7 +58,7 @@
 	${LH_ROOT_COMMAND} umount chroot/sys
 fi
 
-if [ "${LH_CHROOT_BUILD}" = "disabled" ]
+if [ "${LIVE_CHROOT_BUILD}" = "disabled" ]
 then
 	exit 0
 fi

Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption	2007-07-20 05:44:28 UTC (rev 2550)
@@ -86,7 +86,7 @@
 # Installing depends
 Install_package
 
-case "${LH_CHROOT_BUILD}" in
+case "${LIVE_CHROOT_BUILD}" in
 	enabled)
 		# Moving image
 		mv binary/${INITFS}/filesystem.${LIVE_CHROOT_FILESYSTEM} chroot

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-20 05:44:28 UTC (rev 2550)
@@ -249,7 +249,7 @@
 		;;
 esac
 
-if [ "${LH_CHROOT_BUILD}" = "disabled" ]
+if [ "${LIVE_CHROOT_BUILD}" = "disabled" ]
 then
 	FILES="`echo ${FILES} | sed -e 's/chroot//g'`"
 fi

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-07-20 05:44:28 UTC (rev 2550)
@@ -128,7 +128,7 @@
 		;;
 esac
 
-case "${LH_CHROOT_BUILD}" in
+case "${LIVE_CHROOT_BUILD}" in
 	enabled)
 		# Moving image
 		mv binary chroot

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-07-20 05:44:28 UTC (rev 2550)
@@ -57,7 +57,7 @@
 	exit 0
 fi
 
-if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+if [ "${LIVE_CHROOT_BUILD}" = "enabled" ]
 then
 
 	if [ -f chroot/usr/sbin/grub ] && [ ! -d chroot/boot/grub ]
@@ -128,7 +128,7 @@
 mkdir -p "${DESTDIR}"
 
 # Installing memtest
-case "${LH_CHROOT_BUILD}" in
+case "${LIVE_CHROOT_BUILD}" in
 	enabled)
 		cp chroot/boot/${LIVE_MEMTEST}.bin "${DESTDIR}"/memtest
 		;;

Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-07-20 05:44:28 UTC (rev 2550)
@@ -112,7 +112,7 @@
 		DU_DIM="`du -ks chroot/chroot | cut -f1`"
 		REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LIVE_CHROOT_BUILD}" in
 			enabled)
 				Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2"
 
@@ -139,7 +139,7 @@
 			rm -rf binary/${INITFS}/filesystem.dir
 		fi
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LIVE_CHROOT_BUILD}" in
 			enabled)
 				mv chroot/chroot binary/${INITFS}/filesystem.dir
 				;;
@@ -187,7 +187,7 @@
 			cp config/binary_rootfs/squashfs.sort chroot #FIXME
 		fi
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LIVE_CHROOT_BUILD}" in
 			enabled)
 				# Create image
 				Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-20 05:44:28 UTC (rev 2550)
@@ -324,7 +324,7 @@
 		# Copying syslinux
 		mkdir -p binary/isolinux
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LIVE_CHROOT_BUILD}" in
 			enabled)
 				cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
 				;;
@@ -395,7 +395,7 @@
 		# Copying syslinux
 		mkdir -p tftpboot
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LIVE_CHROOT_BUILD}" in
 			enabled)
 				cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
 				;;
@@ -464,7 +464,7 @@
 		# Copying syslinux
 		mkdir -p "${DESTDIR}"
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LIVE_CHROOT_BUILD}" in
 			enabled)
 				cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
 				;;

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-20 05:44:28 UTC (rev 2550)
@@ -243,7 +243,7 @@
 		# Copying yaboot
 		mkdir -p binary/yaboot
 
-		case "${LH_CHROOT_BUILD}" in
+		case "${LIVE_CHROOT_BUILD}" in
 			enabled)
 				cp chroot/usr/lib/yaboot/yaboot binary/yaboot
 				;;

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-07-20 05:41:55 UTC (rev 2549)
+++ dists/trunk/live-helper/helpers/lh_config	2007-07-20 05:44:28 UTC (rev 2550)
@@ -321,10 +321,10 @@
 # (Default: ${LIVE_BOOTLOADER})
 LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
 
-# \${LH_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: ${LH_CHROOT_BUILD})
+# \${LIVE_CHROOT_BUILD: control if we build binary images chrooted
+# (Default: ${LIVE_CHROOT_BUILD})
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
+LIVE_CHROOT_BUILD="${LIVE_CHROOT_BUILD}"
 
 # \$LIVE_DEBIAN_INSTALLER: set debian-installer
 # (Default: ${LIVE_DEBIAN_INSTALLER})




More information about the Debian-live-changes mailing list