bb76751d8a
- Rediff patches to match git repository
- 95fcoe: Check for FCoE devices prior to binaries
* Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch
- 99base: Install chown instead of chgrp
* Modify 0052-99base-Add-chown-binary.patch
- 95iscsi: do not try to detect iSCSI firmware during booting;
should be handled via commandline parameter
* Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch
- Rename patch:
* old: 0051-mkinitrd-suse-add-update-booloader-message.patch
new: 0051-mkinitrd-suse-add-update-bootloader-message.patch
OBS-URL: https://build.opensuse.org/request/show/236229
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 8e920171da42a1c4371db94e4d4fb75f3f261d66 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@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 81c94f2..4963537 100755
|
|
--- a/modules.d/90mdraid/module-setup.sh
|
|
+++ b/modules.d/90mdraid/module-setup.sh
|
|
@@ -88,7 +88,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.4.5
|
|
|