[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-50-g9a1e2b7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 9a1e2b778c724b376f369e85b36f37a0ca770ec2
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Feb 1 11:51:51 2009 +0100

    Correcting wrong logic in defaults.sh which resultet in having loop-aes-utils always installed.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 973bfc0..f823b18 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -476,10 +476,17 @@ Set_defaults ()
 
 	# Setting packages string
 	# LH_PACKAGES
-	if [ -z "${LH_PACKAGES}" ] && [ "${LH_ENCRYPTION}" != "disabled" ]
-	then
-		LH_PACKAGES="loop-aes-utils"
-	fi
+	case "${LH_ENCRYPTION}" in
+		""|disabled)
+			;;
+
+		*)
+			if ! In_list loop-aes-utils "${LH_PACKAGES}"
+			then
+				LH_PACKAGES="${LH_PACKAGES} loop-aes-utils"
+			fi
+			;;
+	esac
 
 	# Setting packages list string
 	LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS:-standard}"

-- 
Debian Live build scripts