rpms/dracut/F-11 0005-mdraid-add-grep-for-convenience.patch, NONE, 1.1 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch, NONE, 1.1 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch, NONE, 1.1 dracut.spec, 1.9, 1.10

Mon Sep 7 10:24:11 UTC 2009

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12785

Modified Files:
	dracut.spec 
Added Files:
	0005-mdraid-add-grep-for-convenience.patch 
	0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch 
	0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch 
Log Message:
* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-3
- fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)


0005-mdraid-add-grep-for-convenience.patch:
 install |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0005-mdraid-add-grep-for-convenience.patch ---
>From 429aa1a2c29dd42fbc91e956a8a77675773cc46d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 3 Sep 2009 17:11:03 +0200
Subject: [PATCH 5/6] mdraid: add grep for convenience

---
 modules.d/90mdraid/install |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 60f289a..497e5b0 100755
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dracut_install mdadm partx
+dracut_install mdadm partx grep
 
 
 # XXX: mdmon really needs to run as non-root?
-- 
1.6.2.5


0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch:
 90crypt/install  |    2 +-
 90dmraid/install |    2 +-
 90lvm/install    |    2 +-
 90mdraid/install |    3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch ---
>From e4dec3d6b66ad6cc3c5b0646459c4ba2db1808b7 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 3 Sep 2009 17:11:57 +0200
Subject: [PATCH 6/6] {crypt,dmraid,lvm,mdraid}: cleanup with pre-pivot 30 and 31

---
 modules.d/90crypt/install  |    2 +-
 modules.d/90dmraid/install |    2 +-
 modules.d/90lvm/install    |    2 +-
 modules.d/90mdraid/install |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules.d/90crypt/install b/modules.d/90crypt/install
index 5108fef..b15440c 100755
--- a/modules.d/90crypt/install
+++ b/modules.d/90crypt/install
@@ -4,4 +4,4 @@ inst_rules "$moddir/70-luks.rules"
 inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
 inst_hook cmdline 30 "$moddir/parse-crypt.sh"
 inst_hook pre-pivot 30 "$moddir/crypt-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/crypt-cleanup.sh"
+inst_hook pre-pivot 31 "$moddir/crypt-cleanup.sh"
diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index 704728b..b66257c 100755
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -4,4 +4,4 @@ inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 inst_rules 64-md-raid.rules
 inst_rules "$moddir/61-dmraid-imsm.rules"
 inst_hook pre-pivot 30 "$moddir/dmraid-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/dmraid-cleanup.sh"
+inst_hook pre-pivot 31 "$moddir/dmraid-cleanup.sh"
diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install
index eb27159..ad4d2e2 100755
--- a/modules.d/90lvm/install
+++ b/modules.d/90lvm/install
@@ -13,4 +13,4 @@ fi
 inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
 inst_hook cmdline 30 "$moddir/parse-lvm.sh"
 inst_hook pre-pivot 30 "$moddir/lvm-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/lvm-cleanup.sh"
\ No newline at end of file
+inst_hook pre-pivot 31 "$moddir/lvm-cleanup.sh"
\ No newline at end of file
diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 497e5b0..71c313b 100755
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -34,4 +34,4 @@ fi
 inst "$moddir/mdraid_start.sh" /sbin/mdraid_start
 inst_hook pre-trigger 30 "$moddir/parse-md.sh"
 inst_hook pre-pivot 30 "$moddir/mdraid-cleanup.sh"
-inst_hook pre-pivot 60 "$moddir/mdraid-cleanup.sh"
\ No newline at end of file
+inst_hook pre-pivot 31 "$moddir/mdraid-cleanup.sh"
-- 
1.6.2.5


0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch:
 install |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch ---
>From 96f3cf1d27268f3784f420ebb52228f3e6b08e77 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Mon, 7 Sep 2009 11:40:20 +0200
Subject: [PATCH 7/8] 95udev-rules: fixed c&p bug which did not install 61-persistent-storage.rules

---
 modules.d/95udev-rules/install |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/95udev-rules/install b/modules.d/95udev-rules/install
index cf22d1e..695e472 100755
--- a/modules.d/95udev-rules/install
+++ b/modules.d/95udev-rules/install
@@ -23,7 +23,7 @@ if [ ! -x /lib/udev/vol_id ]; then
 else
     inst_rules "$moddir/59-persistent-storage-volid.rules"
 fi
-inst_rules "$moddir/61-persistent-storage-volid.rules"
+inst_rules "$moddir/61-persistent-storage.rules"
     
 for i in \
 ata_id \
-- 
1.6.2.5



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-11/dracut.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dracut.spec	2 Sep 2009 13:58:33 -0000	1.9
+++ dracut.spec	7 Sep 2009 10:24:11 -0000	1.10
@@ -13,12 +13,17 @@
 
 Name: dracut
 Version: 001
-Release: 1%{?rdist}
+Release: 3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
 URL: http://apps.sourceforge.net/trac/dracut/wiki
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
+
+Patch1: 0005-mdraid-add-grep-for-convenience.patch
+Patch2: 0006--crypt-dmraid-lvm-mdraid-cleanup-with-pre-pivot-30.patch
+Patch3: 0007-95udev-rules-fixed-c-p-bug-which-did-not-install-61.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: util-linux-ng
@@ -102,6 +107,9 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 make
@@ -179,6 +187,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Sep 07 2009 Harald Hoyer <harald at redhat.com> 001-3
+- fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)
+
+* Thu Sep 03 2009 Harald Hoyer <harald at redhat.com> 001-2
+- fixed missing grep for md
+- reorder cleanup
+
 * Wed Sep 02 2009 Harald Hoyer <harald at redhat.com> 001-1
 - version 001
 - see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS


