summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-11-11 14:14:25 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:29 +0100
commitb17568a3954d0129bf2bd79340cacb3e7d563e54 (patch)
treeae7e2855f5be0e02183b020607cc41c91977f634
parent532f4e281f1a1c4687f9841201cf85f46d6aec31 (diff)
downloadvyos-live-build-b17568a3954d0129bf2bd79340cacb3e7d563e54.tar.gz
vyos-live-build-b17568a3954d0129bf2bd79340cacb3e7d563e54.zip
Added warning about etch compatibility of lh_config options.
-rwxr-xr-xfunctions/defaults.sh20
-rwxr-xr-xhelpers/lh_config3
2 files changed, 23 insertions, 0 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 69181b64a..a96ed1df3 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 32f72c573..c3769d80f 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