Shawn Dunn
7955a4d13a
- Update dracut to 037 * Add --hostonly_cmdline switch * Update --mount syntax * Include modules from /updates directory * Fixes for network setup * Some small fixes - Rediff patches - Include iscsiuio again (bnc#872474) Remove: remove-iscsiuio.patch - Install 59-scsi-sg_utils.rules (bnc#872478) Add: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch - Install 67-kpartx-compat.rules (bnc#872662) Add: 0016-90multipath-add-67-kpartx-compat.rules.patch - Install separate multipath service file (bnc#871610) Add: 0017-90multipath-install-dracut-specific-service-file.patch - Do not fsck and mount from fstab if systemd is used (bnc# Add: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch - Fixup initqueue for remote-fs Add: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch OBS-URL: https://build.opensuse.org/request/show/229484 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=124
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From 7995f23a106e28afa0204b5eca68671cb514b1d9 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>
|
|
---
|
|
modules.d/95dasd_rules/module-setup.sh | 4 ++--
|
|
modules.d/95zfcp_rules/module-setup.sh | 1 +
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules.d/95dasd_rules/module-setup.sh b/modules.d/95dasd_rules/module-setup.sh
|
|
index 51c315d..451fc25 100755
|
|
--- a/modules.d/95dasd_rules/module-setup.sh
|
|
+++ b/modules.d/95dasd_rules/module-setup.sh
|
|
@@ -6,7 +6,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
|
|
}
|
|
|
|
@@ -18,10 +18,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 d9879cb..849645c 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
|
|
}
|
|
--
|
|
1.8.1.4
|
|
|