[dracut/f16] fixed environment passing to real init Resolves: rhbz#733674 fixed lvm on md

[Harald Hoyer]

commit 53b2970502e805a3309de222874a47cba4ca7993
Author: Harald Hoyer <harald at redhat.com>
Date:   Tue Aug 30 16:35:14 2011 +0200

    fixed environment passing to real init
    Resolves: rhbz#733674
    fixed lvm on md

 ...-md-incremental-imsm.rules-incremental-ru.patch |   26 ++++++++++++++++
 ...-save-and-restore-environment-given-from-.patch |   32 ++++++++++++++++++++
 dracut.spec                                        |   18 ++++++++--
 3 files changed, 72 insertions(+), 4 deletions(-)
---
diff --git a/0018-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch b/0018-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
new file mode 100644
index 0000000..66d1aa3
--- /dev/null
+++ b/0018-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
@@ -0,0 +1,26 @@
+From 1073b9f93acb76993b4cc41b896325d1041841d1 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 24 Aug 2011 16:35:33 +0200
+Subject: [PATCH] 90mdraid/65-md-incremental-imsm.rules: incremental run to
+ settled
+
+move incremental run to settled queue again
+
+https://bugzilla.redhat.com/show_bug.cgi?id=732967
+---
+ modules.d/90mdraid/65-md-incremental-imsm.rules |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
+index 4fc8428..7c1d503 100644
+--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
++++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
+@@ -29,7 +29,7 @@ LABEL="do_md_inc"
+ ENV{rd_MDADMCONF}!="?*", GOTO="md_auto_end"
+ 
+ RUN+="/sbin/initqueue --finished --unique --name md_finished /sbin/md_finished.sh"
+-RUN+="/sbin/initqueue --timeout --onetime --unique /sbin/mdadm_auto"
++RUN+="/sbin/initqueue --settled --onetime --unique /sbin/mdadm_auto"
+ 
+ GOTO="md_inc_end"
+ 
diff --git a/0024-99base-init-save-and-restore-environment-given-from-.patch b/0024-99base-init-save-and-restore-environment-given-from-.patch
new file mode 100644
index 0000000..e47973f
--- /dev/null
+++ b/0024-99base-init-save-and-restore-environment-given-from-.patch
@@ -0,0 +1,32 @@
+From ed42e64cfc2c3d36436ef0d0634332219dcce1a2 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Tue, 30 Aug 2011 16:22:46 +0200
+Subject: [PATCH] 99base/init: save and restore environment given from the
+ kernel
+
+---
+ modules.d/99base/init |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/modules.d/99base/init b/modules.d/99base/init
+index 0328903..21b9468 100755
+--- a/modules.d/99base/init
++++ b/modules.d/99base/init
+@@ -8,6 +8,8 @@
+ # Harald Hoyer <harald at redhat.com>
+ # Jeremy Katz <katzj at redhat.com>
+ 
++export -p > /tmp/export.orig
++
+ wait_for_loginit()
+ {
+     set +x
+@@ -391,6 +393,8 @@ for i in $(export -p); do
+             unset "$i";;
+     esac
+ done
++. /tmp/export.orig
++rm -f /tmp/export.orig
+ 
+ initargs=""
+ read CLINE </proc/cmdline
diff --git a/dracut.spec b/dracut.spec
index e636f14..cda6217 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -8,7 +8,7 @@
 
 Name: dracut
 Version: 013
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel} > 6
@@ -22,8 +22,11 @@ URL: https://dracut.wiki.kernel.org/
 # Source can be generated by
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
 Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
-Patch1: 0002-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
-Patch2: 0003-fix-live-crash-with-livenet-installed.patch
+
+Patch2: 0002-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
+Patch3: 0003-fix-live-crash-with-livenet-installed.patch
+Patch18: 0018-90mdraid-65-md-incremental-imsm.rules-incremental-ru.patch
+Patch24: 0024-99base-init-save-and-restore-environment-given-from-.patch
 
 BuildArch: noarch
 BuildRequires: dash bash
@@ -157,8 +160,10 @@ This package contains tools to assemble the local initrd and host configuration.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch18 -p1
+%patch24 -p1
 
 %build
 make
@@ -297,6 +302,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Aug 30 2011 Harald Hoyer <harald at redhat.com> 013-6
+- fixed environment passing to real init
+Resolves: rhbz#733674
+- fixed lvm on md
+
 * Mon Aug 29 2011 Harald Hoyer <harald at redhat.com> 013-5
 - fixed rhel/fedora version checks