49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
From 9b76077d6e70d1ae37273a587277ccef467e698b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hannes Reinecke <hare@suse.de>
|
||
|
|
Date: Tue, 21 Jan 2014 14:32:09 +0100
|
||
|
|
Subject: [PATCH] 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 d313171..78ab2d0 100755
|
||
|
|
--- a/modules.d/95dasd_rules/module-setup.sh
|
||
|
|
+++ b/modules.d/95dasd_rules/module-setup.sh
|
||
|
|
@@ -5,7 +5,6 @@
|
||
|
|
# called by dracut
|
||
|
|
check() {
|
||
|
|
local _arch=$(uname -m)
|
||
|
|
- [ -x /sbin/dasd_configure ] || return 1
|
||
|
|
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
|
||
|
|
return 0
|
||
|
|
}
|
||
|
|
@@ -18,10 +17,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 9a1ab20..40c62a1 100755
|
||
|
|
--- a/modules.d/95zfcp_rules/module-setup.sh
|
||
|
|
+++ b/modules.d/95zfcp_rules/module-setup.sh
|
||
|
|
@@ -21,5 +21,6 @@ install() {
|
||
|
|
inst_hook cmdline 30 "$moddir/parse-zfcp.sh"
|
||
|
|
if [[ $hostonly ]] ; then
|
||
|
|
inst_rules_wildcard 51-zfcp-*.rules
|
||
|
|
+ inst_rules_wildcard 41-s390x-zfcp-*.rules
|
||
|
|
fi
|
||
|
|
}
|