summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-01-14 20:26:34 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:39 +0100
commitbebfa492f7d534c06c2a6adff21b242cfad6899d (patch)
treecdc4939a3382448586ce40059764b48306ed3b80
parent254eb5cc07447d60e16e9acf1b802c9935ab03a1 (diff)
downloadlive-build-bebfa492f7d534c06c2a6adff21b242cfad6899d.zip
live-build-bebfa492f7d534c06c2a6adff21b242cfad6899d.tar.gz
Adding short comments to the different cases in Check_defaults();.
-rwxr-xr-xfunctions/defaults.sh5
1 files changed, 5 insertions, 0 deletions
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*)
;;