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
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From b96bf725952cc8b1489a4f52f8dd3e64d542dda7 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Wed, 9 Apr 2014 14:14:03 +0200
|
|
Subject: [PATCH] Fixup mdraid setup
|
|
|
|
This sed script to edit 64-md-raid-assemble.rules needs to
|
|
be adjusted for latest mdadm
|
|
|
|
References: bnc#866660
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
---
|
|
modules.d/90mdraid/module-setup.sh | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
|
|
index ac745d1..767b3aa 100755
|
|
--- a/modules.d/90mdraid/module-setup.sh
|
|
+++ b/modules.d/90mdraid/module-setup.sh
|
|
@@ -86,7 +86,7 @@ install() {
|
|
for rule in 64-md-raid.rules 64-md-raid-assembly.rules; do
|
|
rule_path="${initdir}${udevdir}/rules.d/${rule}"
|
|
[ -f "${rule_path}" ] && sed -i -r \
|
|
- -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode|\$devnode)/d' \
|
|
+ -e '/(RUN|IMPORT\{program\})\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(--export )?(\$env\{DEVNAME\}|\$tempnode|\$devnode)/d' \
|
|
"${rule_path}"
|
|
done
|
|
|
|
--
|
|
1.8.1.4
|
|
|