summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rwxr-xr-xmkinitramfs25
2 files changed, 22 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index d506d71..4993f97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,12 @@ initramfs-tools (0.89) unstable; urgency=low
Thanks "A. Costa" <agcosta@gis.net> for the patch.
* scripts/local: Try to warn for renamed root dev. (closes: #374611)
-
- -- maximilian attems <maks@debian.org> Wed, 20 Jun 2007 20:56:14 +0200
+ * minitramfs: Fall back to bootable default MODULES=most if unsupported
+ MODULES setting is passed. Thanks Henning Sprang <henning_sprang@gmx.de>
+ for report. (closes: #429144)
+
+ -- maximilian attems <maks@debian.org> Wed, 20 Jun 2007 21:06:43 +0200
initramfs-tools (0.88) unstable; urgency=low
diff --git a/mkinitramfs b/mkinitramfs
index a2e643c..d8a24fe 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -181,18 +181,27 @@ for x in "${CONFDIR}/modules" /usr/share/initramfs-tools/modules.d/*; do
fi
done
-if [ "${MODULES}" = "dep" ]; then
+# MODULES=most is default
+case "${MODULES}" in
+dep)
dep_add_modules
-fi
-
-if [ "${MODULES}" = "most" ]; then
+ ;;
+most)
auto_add_modules
-fi
-
-if [ "${MODULES}" = "netboot" ]; then
+ ;;
+netboot)
auto_add_modules base
auto_add_modules net
-fi
+ ;;
+list)
+ # nothing to add
+ ;;
+*)
+ echo "mkinitramfs: Warning unsupported MODULES setting: ${MODULES}."
+ echo "mkinitramfs: Falling back to MODULES=most."
+ auto_add_modules
+ ;;
+esac
# Have to do each file, because cpio --dereference doesn't recurse down
# symlinks.