From f676c2ad02d67f486b11d3fdc564c897ca5ce301 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 22 Mar 2012 17:07:32 +0100
Subject: [PATCH] dracut-017-62.git20120322

- fixed /run prefix copying
---
 ...-level-down-for-the-manpage-includes.patch | 30 +++++++++++++++++++
 0060-shutdown-fix-PATH.patch                  | 23 ++++++++++++++
 ...evert-the-cp-mv-change-for-run-initr.patch | 23 ++++++++++++++
 dracut.spec                                   |  8 ++++-
 4 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 0059-dracut.asc-set-level-down-for-the-manpage-includes.patch
 create mode 100644 0060-shutdown-fix-PATH.patch
 create mode 100644 0061-99base-init.sh-revert-the-cp-mv-change-for-run-initr.patch

diff --git a/0059-dracut.asc-set-level-down-for-the-manpage-includes.patch b/0059-dracut.asc-set-level-down-for-the-manpage-includes.patch
new file mode 100644
index 0000000..ac08c31
--- /dev/null
+++ b/0059-dracut.asc-set-level-down-for-the-manpage-includes.patch
@@ -0,0 +1,30 @@
+From 3d3f32aea3d2cfb8bffe3e487aca0296d0939ea2 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 21 Mar 2012 17:40:08 +0100
+Subject: [PATCH] dracut.asc: set level down for the manpage includes
+
+---
+ dracut.asc |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/dracut.asc b/dracut.asc
+index a4bf726..1a0e3d2 100644
+--- a/dracut.asc
++++ b/dracut.asc
+@@ -1007,6 +1007,8 @@ FIXME
+ 
+ FIXME
+ 
++
++:leveloffset: 1
+ [[dracut8]]
+ include::dracut.8.asc[]
+ 
+@@ -1016,6 +1018,7 @@ include::dracut.conf.5.asc[]
+ [[dracutcmdline7]]
+ include::dracut.cmdline.7.asc[]
+ 
++:leveloffset: 0
+ [appendix]
+ License
+ -------
diff --git a/0060-shutdown-fix-PATH.patch b/0060-shutdown-fix-PATH.patch
new file mode 100644
index 0000000..b25405c
--- /dev/null
+++ b/0060-shutdown-fix-PATH.patch
@@ -0,0 +1,23 @@
+From 317191848a64006249de30fb3ed388a88ff22a90 Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods@redhat.com>
+Date: Wed, 21 Mar 2012 19:47:46 -0400
+Subject: [PATCH] shutdown: fix PATH
+
+Some systems might not use /bin:/sbin in their paths anymore, but we're
+still using it in initramfs, so make sure our PATH is correct.
+---
+ modules.d/99shutdown/shutdown.sh |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
+index c8ca664..8817a4c 100755
+--- a/modules.d/99shutdown/shutdown.sh
++++ b/modules.d/99shutdown/shutdown.sh
+@@ -10,6 +10,7 @@
+ #!/bin/sh
+ . /lib/dracut-lib.sh
+ export TERM=linux
++PATH=/usr/sbin:/usr/bin:/sbin:/bin
+ 
+ emergency_shell()
+ {
diff --git a/0061-99base-init.sh-revert-the-cp-mv-change-for-run-initr.patch b/0061-99base-init.sh-revert-the-cp-mv-change-for-run-initr.patch
new file mode 100644
index 0000000..01ade5f
--- /dev/null
+++ b/0061-99base-init.sh-revert-the-cp-mv-change-for-run-initr.patch
@@ -0,0 +1,23 @@
+From 56bf6156d6022b30f5354467f552496e8b87a71b Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 22 Mar 2012 17:05:20 +0100
+Subject: [PATCH] 99base/init.sh: revert the "cp" "mv" change for
+ /run/initramfs
+
+---
+ modules.d/99base/init.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
+index 84c13e0..2f87a20 100755
+--- a/modules.d/99base/init.sh
++++ b/modules.d/99base/init.sh
+@@ -68,7 +68,7 @@ fi
+ if ! ismounted /run; then
+     mkdir -m 0755 /newrun
+     mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /newrun >/dev/null 
+-    mv /run/* /newrun >/dev/null 2>&1
++    cp -a /run/* /newrun >/dev/null 2>&1
+     mount --move /newrun /run
+     rm -fr /newrun
+ fi
diff --git a/dracut.spec b/dracut.spec
index 2b35479..8072705 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 017
-Release: 59.git20120321%{?dist}
+Release: 62.git20120322%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -82,6 +82,9 @@ Patch55: 0055-Do-not-mount-bind-run-anymore.patch
 Patch56: 0056-98selinux-selinux-loadpolicy.sh-use-mount-rbind-for-.patch
 Patch57: 0057-Avoid-use-of-export-n.patch
 Patch58: 0058-provide-name-based-nbd-connects.patch
+Patch59: 0059-dracut.asc-set-level-down-for-the-manpage-includes.patch
+Patch60: 0060-shutdown-fix-PATH.patch
+Patch61: 0061-99base-init.sh-revert-the-cp-mv-change-for-run-initr.patch
 
 
 BuildArch: noarch
@@ -386,6 +389,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Mar 22 2012 Harald Hoyer <harald@redhat.com> 017-62.git20120322
+- fixed /run prefix copying
+
 * Wed Mar 21 2012 Harald Hoyer <harald@redhat.com> 017-59.git20120321
 - new upstream version, which fixes various anaconda loader issues