[dracut/f16] fixed mdraid container handling Resolves: rhbz#743240
Harald Hoyer
harald at fedoraproject.org
Tue Oct 4 12:33:58 UTC 2011
commit cfb1dbbaea0ce6fc47f7904db0dad84a40bbc1c2
Author: Harald Hoyer <harald at redhat.com>
Date: Tue Oct 4 14:33:37 2011 +0200
fixed mdraid container handling
Resolves: rhbz#743240
...draid-module-setup.sh-fixed-sed-arguments.patch | 22 ++++++++++++++++++++
dracut.spec | 6 +++-
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/0066-90mdraid-module-setup.sh-fixed-sed-arguments.patch b/0066-90mdraid-module-setup.sh-fixed-sed-arguments.patch
new file mode 100644
index 0000000..a3aa8f7
--- /dev/null
+++ b/0066-90mdraid-module-setup.sh-fixed-sed-arguments.patch
@@ -0,0 +1,22 @@
+From 54ffd5447da0a912f91d21dde22d56b0f5762484 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 4 Oct 2011 13:30:35 +0200
+Subject: [PATCH] 90mdraid/module-setup.sh: fixed sed arguments
+
+---
+ modules.d/90mdraid/module-setup.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
+index 5e819b1..fe793bb 100755
+--- a/modules.d/90mdraid/module-setup.sh
++++ b/modules.d/90mdraid/module-setup.sh
+@@ -54,7 +54,7 @@ install() {
+ # 65-md-inc*.rules and its fine-grained controls, or cause other problems
+ # when we explicitly don't want certain components to be incrementally
+ # assembled
+- sed -ire '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode)"/d' "${initdir}/lib/udev/rules.d/64-md-raid.rules"
++ sed -i -r -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode)"/d' "${initdir}/lib/udev/rules.d/64-md-raid.rules"
+ fi
+
+ inst_rules "$moddir/65-md-incremental-imsm.rules"
diff --git a/dracut.spec b/dracut.spec
index 5102172..ea72a06 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -8,7 +8,7 @@
Name: dracut
Version: 013
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel} > 6
@@ -56,6 +56,7 @@ Patch60: 0060-90mdraid-more-thorough-64-md-raid.rules-edit.patch
Patch61: 0061-90mdraid-adjust-dev-md-loops.patch
Patch64: 0064-order-mdadm-and-lvm-timeout-operations.patch
Patch65: 0065-90mdraid-mdraid_start.sh-fix-path-to-md-sysfs.patch
+Patch66: 0066-90mdraid-module-setup.sh-fixed-sed-arguments.patch
BuildArch: noarch
BuildRequires: dash bash
@@ -222,6 +223,7 @@ This package contains tools to assemble the local initrd and host configuration.
%patch61 -p1
%patch64 -p1
%patch65 -p1
+%patch66 -p1
chmod a+x modules.d/*/*.sh
find . -name *.orig -print0 | xargs -0 rm -f
@@ -363,7 +365,7 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
-* Tue Oct 04 2011 Harald Hoyer <harald at redhat.com> 013-13
+* Tue Oct 04 2011 Harald Hoyer <harald at redhat.com> 013-15
- fixed mdraid container handling
Resolves: rhbz#743240
More information about the scm-commits
mailing list