[SCM] debian-live/live-helper branch, master, updated. 1.0_a35-1-9-g0408e7e

[Daniel Baumann]

The branch, master has been updated
       via  0408e7ebbaa81db5c60592906c2a35696e3d96ab (commit)
      from  8635931e79730eb75ca8f9b3c581845c2613ebf2 (commit)


- Shortlog ------------------------------------------------------------
0408e7e Added warning about etch compatibility of lh_config options.

Summary of changes:
 functions/defaults.sh |   20 ++++++++++++++++++++
 helpers/lh_config     |    3 +++
 2 files changed, 23 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 0408e7ebbaa81db5c60592906c2a35696e3d96ab
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 11 14:14:25 2007 +0100

    Added warning about etch compatibility of lh_config options.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 69181b6..a96ed1d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -594,3 +594,23 @@ Set_defaults ()
 	# Setting fakeroot/fakechroot
 	LH_USE_FAKEROOT="${LH_USE_FAKEROOT:-disabled}"
 }
+
+Check_defaults ()
+{
+	if [ "${LH_DISTRIBUTION}" = "etch" ]
+	then
+		if [ "${LH_INITRAMFS}" = "live-initramfs" ]
+		then
+			Echo_warning "You selected LH_DISTRIBUTION='etch' and LH_INITRAMFS='live-initramfs'"
+			Echo_warning "This is a possible unsave configuration as live-initramfs is not"
+			Echo_warning "part of the etch distribution."
+		fi
+
+		if [ "${LH_UNION_FILESYSTEM}" = "aufs" ]
+		then
+			Echo_warning "You selected LH_DISTRIBUTION='etch' and LH_UNION_FILESYSTEM='aufs'"
+			Echo_warning "This is a possible unsave configuration as aufs is not"
+			Echo_warning "part of the etch distribution."
+		fi
+	fi
+}
diff --git a/helpers/lh_config b/helpers/lh_config
index 32f72c5..c3769d8 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -623,6 +623,9 @@ then
 	Read_conffile "${LH_CONFFILE}"
 fi
 
+# Checking defaults
+Check_defaults
+
 # Creating bootstrap configuration
 mkdir -p config
 mkdir -p config/includes

-- 
debian-live/live-helper