[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-2-gbc82584

[Daniel Baumann]

The following commit has been merged in the master branch:
commit b88972f8bef108ef8b2acc3140d31b9e0d81b599
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jan 14 20:26:34 2009 +0100

    Adding short comments to the different cases in Check_defaults();.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 86cd633..71769cf 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -760,6 +760,7 @@ Check_defaults ()
 {
 	if [ "${LH_DISTRIBUTION}" = "etch" ]
 	then
+		# etch + live-initramfs
 		if [ "${LH_INITRAMFS}" = "live-initramfs" ]
 		then
 			Echo_warning "You selected LH_DISTRIBUTION='etch' and LH_INITRAMFS='live-initramfs'"
@@ -771,6 +772,7 @@ Check_defaults ()
 			Echo_warning "default (casper)."
 		fi
 
+		# etch + aufs
 		if [ "${LH_UNION_FILESYSTEM}" = "aufs" ]
 		then
 			Echo_warning "You selected LH_DISTRIBUTION='etch' and LH_UNION_FILESYSTEM='aufs'"
@@ -786,6 +788,7 @@ Check_defaults ()
 
 	if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
 	then
+		# aptitude + stripped|minimal
 		if [ "${LH_APT}" = "aptitude" ]
 		then
 			Echo_warning "You selected LH_PACKAGES_LISTS='%s' and LH_APT='aptitude'" "${LH_PACKAGES_LIST}"
@@ -796,6 +799,7 @@ Check_defaults ()
 
 	if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
 	then
+		# d-i enabled, no caching
 		if ! echo ${LH_CACHE_STAGES} | grep -qs "bootstrap\b" || [ "${LH_CACHE}" != "enabled" ] || [ "${LH_CACHE_PACKAGES}" != "enabled" ]
 		then
 			Echo_warning "You have selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and"
@@ -807,6 +811,7 @@ Check_defaults ()
 
 	if [ "${LH_BOOTLOADER}" = "syslinux" ]
 	then
+		# syslinux + fat
 		case "${LH_BINARY_FILESYSTEM}" in
 			fat*)
 				;;

-- 
Debian Live build scripts