From: Hannes Reinecke <hare@suse.de>
Date: Tue, 21 Jan 2014 13:32:09 +0000 (+0100)
Subject: Add new s390x-specific rule files
X-Git-Tag: 046~51^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55c763b1ff37405da390ab1ef5765683f3a7838e;p=thirdparty%2Fdracut.git

Add new s390x-specific rule files

With the new s390x configuration tool the naming of the udev
rules files have changed. So add these to the existing ones
to be compatible with existing and new installations.

References: bnc#856585

Signed-off-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/modules.d/95dasd_rules/module-setup.sh b/modules.d/95dasd_rules/module-setup.sh
index 80887dede..acdf1e726 100755
--- a/modules.d/95dasd_rules/module-setup.sh
+++ b/modules.d/95dasd_rules/module-setup.sh
@@ -4,7 +4,7 @@
 check() {
     local _arch=$(uname -m)
     [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
-    require_binaries dasd_configure /usr/lib/udev/collect || return 1
+    require_binaries /usr/lib/udev/collect || return 1
     return 0
 }
 
@@ -16,10 +16,10 @@ depends() {
 
 # called by dracut
 install() {
-    inst_multiple /usr/lib/udev/collect
     inst_hook cmdline 30 "$moddir/parse-dasd.sh"
     if [[ $hostonly ]] ; then
         inst_rules_wildcard 51-dasd-*.rules
+        inst_rules_wildcard 41-s390x-dasd-*.rules
     fi
     inst_rules 59-dasd.rules
 }
diff --git a/modules.d/95zfcp_rules/module-setup.sh b/modules.d/95zfcp_rules/module-setup.sh
index eed6ffd2e..d6a33b13d 100755
--- a/modules.d/95zfcp_rules/module-setup.sh
+++ b/modules.d/95zfcp_rules/module-setup.sh
@@ -56,5 +56,6 @@ install() {
     fi
     if [[ $hostonly ]] ; then
         inst_rules_wildcard 51-zfcp-*.rules
+        inst_rules_wildcard 41-s390x-zfcp-*.rules
     fi
 }