[SCM] debian-live/live-helper branch, master, updated. 1.0_a40-1-17-g7150380

[Chris Lamb]

The following commit has been merged in the master branch:
commit 1ca0b58aac2ab58b900eb0c44490ba15d0052f2a
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Mar 23 04:21:47 2008 +0000

    Allow LH_ENCRYPTION="disabled" to disable encryption
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 70aa6f2..4023fa6 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -430,10 +430,13 @@ Set_defaults ()
 			fi
 		fi
 
-		if [ -n "${LH_ENCRYPTION}" ]
-		then
-			LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} loop-aes-modules-2.6"
-		fi
+		case "${LH_ENCRYPTION}" in
+			""|disabled)
+				;;
+			*)
+				LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} loop-aes-modules-2.6"
+				;;
+		esac
 	fi
 
 	# Setting packages string
@@ -529,7 +532,7 @@ Set_defaults ()
 	LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY:-disabled}"
 
 	# Setting encryption
-	# LH_ENCRYPTION
+	LH_ENCRYPTION="${LH_ENCRYPTION:-disabled}"
 
 	# Setting grub splash
 	# LH_GRUB_SPLASH
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 35bdc24..1de5b94 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -33,10 +33,27 @@ Read_conffile config/source
 Read_conffile "${LH_CONFIG}"
 Set_defaults
 
-if [ -z "${LH_ENCRYPTION}" ]
-then
-	exit 0
-fi
+case "${LH_ENCRYPTION}" in
+	aes128|aes192|aes256)
+		;;
+	""|disabled)
+		exit 0
+		;;
+	*)
+		Echo_error "Encryption type \"${LH_ENCRYPTION}\" not supported."
+		exit 1
+		;;
+esac
+
+case "${LH_CHROOT_FILESYSTEM}" in
+	ext2|squashfs)
+		;;
+
+	*)
+		Echo_error "Encryption not yet supported on ${LH_CHROOT_FILESYSTEM} filesystems."
+		exit 1
+		;;
+esac
 
 Echo_message "Begin encrypting root filesystem image..."
 
@@ -63,26 +80,6 @@ case "${LH_INITRAMFS}" in
 		;;
 esac
 
-case "${LH_CHROOT_FILESYSTEM}" in
-	ext2)
-		ROOTFS="ext2"
-		;;
-
-	jffs2)
-		Echo_warning "encryption not yet supported on jffs2 filesystem."
-		exit 0
-		;;
-
-	plain)
-		Echo_warning "encryption not supported on plain filesystem."
-		exit 0
-		;;
-
-	squashfs)
-		ROOTFS="squashfs"
-		;;
-esac
-
 # Checking depends
 Check_package chroot/usr/bin/aespipe aespipe
 
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 6915cf5..1e4376b 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -136,10 +136,13 @@ Check_multiarchitecture
 mkdir -p "${DESTDIR_LIVE}"
 
 # Setting boot parameters
-if [ -n "${LH_ENCRYPTION}" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
-fi
+
+case "${LH_ENCRYPTION}" in
+	""|disabled)
+		;;
+	*)
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+esac
 
 if [ -n "${LH_USERNAME}" ]
 then
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 535fb8f..98dabeb 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -388,10 +388,13 @@ mkdir -p "${SCREEN_PATH}"
 mkdir -p "${DATA_PATH}"
 
 # Setting boot parameters
-if [ -n "${LH_ENCRYPTION}" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
-fi
+case "${LH_ENCRYPTION}" in
+	""|disabled)
+		;;
+	*)
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+		;;
+esac
 
 if [ -n "${LH_USERNAME}" ]
 then
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index 85a7f94..2ae5c55 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -144,10 +144,13 @@ Check_multiarchitecture
 mkdir -p "${DESTDIR_LIVE}"
 
 # Setting boot parameters
-if [ -n "${LH_ENCRYPTION}" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
-fi
+case "${LH_ENCRYPTION}" in
+	""|disabled)
+		;;
+	*)
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+		;;
+esac
 
 if [ -n "${LH_USERNAME}" ]
 then
diff --git a/helpers/lh_config b/helpers/lh_config
index 42df97f..f7c2871 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -56,7 +56,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--debian-installer-daily enabled|disabled]\n\
 \t    [--debug]\n\
 \t    [-d|--distribution CODENAME]\n\
-\t    [-e|--encryption aes128|aes192|aes256]\n\
+\t    [-e|--encryption disabled|aes128|aes192|aes256]\n\
 \t    [--fdisk fdisk|fdisk.dist]\n\
 \t    [--force]\n\
 \t    [--genisoimage genisomage|mkisofs]\n\
@@ -989,7 +989,7 @@ LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
 LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY}"
 
 # \$LH_ENCRYPTION: set encrytion
-# (Default: empty)
+# (Default: ${LH_ENCRYPTION})
 LH_ENCRYPTION="${LH_ENCRYPTION}"
 
 # \$LH_GRUB_SPLASH: set custom grub splash

-- 
debian-live/live-helper