From: Harald Hoyer <harald@redhat.com>
Date: Fri, 12 Sep 2014 08:19:28 +0000 (+0200)
Subject: dracut-functions.sh: exit for missing  --force-add or --add dracut modules
X-Git-Tag: 039~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a49cac2e65eb1beb8b0442b74aaa4851d184c0ce;p=thirdparty%2Fdracut.git

dracut-functions.sh: exit for missing  --force-add or --add dracut modules

Better exit with fail early, so there is no surprise on reboot.
---

diff --git a/dracut-functions.sh b/dracut-functions.sh
index 346ab97e5..8d62c3035 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -1413,11 +1413,17 @@ for_each_module_dir() {
 
     # Report any missing dracut modules, the user has specified
     _modcheck="$add_dracutmodules $force_add_dracutmodules"
-    [[ $dracutmodules != all ]] && _modcheck="$m $dracutmodules"
+    [[ $dracutmodules != all ]] && _modcheck="$_modcheck $dracutmodules"
     for _mod in $_modcheck; do
         [[ " $mods_to_load " == *\ $_mod\ * ]] && continue
-        [[ " $omit_dracutmodules " == *\ $_mod\ * ]] && continue
+
+        [[ " $force_add_dracutmodules " != *\ $_mod\ * ]] \
+            && [[ " $omit_dracutmodules " == *\ $_mod\ * ]] \
+            && continue
+
         derror "dracut module '$_mod' cannot be found or installed."
+        [[ " $force_add_dracutmodules " == *\ $_mod\ * ]] && exit 1
+        [[ " $add_dracutmodules " == *\ $_mod\ * ]] && exit 1
     done
 }