[PATCH 1/2] mkinitrd: recognize that raid1 and raid10 are not the same module (#501135)

[Hans de Goede <hdegoede@xxxxxxxxxx>]

mkinitrd was using =~ to match new modules against the list of modules
it was already going to load, this caused it to think that
raid1 and raid10 were the same module, this patch fixes this.
---
 mkinitrd |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mkinitrd b/mkinitrd
index 2b2486c..a723876 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -253,8 +253,13 @@ findmodule() {
     fi
 
     # only need to add each module once
-    [[ "$(eval echo \${$modlist})" =~ "$modName" ]] || \
-        eval $modlist=\"\${$modlist} $modName\"
+    case " $(eval echo \${$modlist}) " in
+        *" $modName "*)
+            return ;;
+        *)
+            eval $modlist=\"\${$modlist} $modName\"
+            ;;
+    esac
 
     # need to handle prescsimods here -- they need to go _after_ scsi_mod
     if [ "$modName" = "scsi_mod" ]; then
-- 
1.6.2.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list