From b9a7ee4c3f0699ddb3c140423dd70e151a3b63b2 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 8 Feb 2012 17:05:49 +0100
Subject: [PATCH] update to latest git

---
 ...ut-setup-clean-PATH-w-o-existing-one.patch | 26 ++++++++++++++++
 ...BTRFSRAID-write-diskimage-to-tmp-dir.patch | 31 +++++++++++++++++++
 dracut.spec                                   |  7 ++++-
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 0001-dracut-setup-clean-PATH-w-o-existing-one.patch
 create mode 100644 0002-TEST-15-BTRFSRAID-write-diskimage-to-tmp-dir.patch

diff --git a/0001-dracut-setup-clean-PATH-w-o-existing-one.patch b/0001-dracut-setup-clean-PATH-w-o-existing-one.patch
new file mode 100644
index 0000000..b72c057
--- /dev/null
+++ b/0001-dracut-setup-clean-PATH-w-o-existing-one.patch
@@ -0,0 +1,26 @@
+From 68910ba4a510e2d10e1c16adb348a8916a74b281 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 8 Feb 2012 17:02:17 +0100
+Subject: [PATCH] dracut: setup clean PATH w/o existing one
+
+---
+ dracut |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/dracut b/dracut
+index 86fcaf3..545f9db 100755
+--- a/dracut
++++ b/dracut
+@@ -284,9 +284,10 @@ for i in /usr/bin /bin /usr/sbin /sbin; do
+     if [ -L "$i" ]; then
+         rl=$(readlink -f $i)
+     fi
+-    PATH="$PATH:$rl"
++    NPATH="$NPATH:$rl"
+ done
+-export PATH
++export PATH="$NPATH"
++unset NPATH
+ unset LD_LIBRARY_PATH
+ unset GREP_OPTIONS
+ 
diff --git a/0002-TEST-15-BTRFSRAID-write-diskimage-to-tmp-dir.patch b/0002-TEST-15-BTRFSRAID-write-diskimage-to-tmp-dir.patch
new file mode 100644
index 0000000..a6496e9
--- /dev/null
+++ b/0002-TEST-15-BTRFSRAID-write-diskimage-to-tmp-dir.patch
@@ -0,0 +1,31 @@
+From 12018c91eac3e0165fe3d5df5bc1382fdf64d2a1 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 8 Feb 2012 17:02:57 +0100
+Subject: [PATCH] TEST-15-BTRFSRAID: write diskimage to tmp dir
+
+---
+ test/TEST-15-BTRFSRAID/test.sh |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
+index bacdb4a..8f7839d 100755
+--- a/test/TEST-15-BTRFSRAID/test.sh
++++ b/test/TEST-15-BTRFSRAID/test.sh
+@@ -5,8 +5,8 @@ KVERSION=${KVERSION-$(uname -r)}
+ 
+ # Uncomment this to debug failures
+ #DEBUGFAIL="rd.shell"
+-DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img
+ test_run() {
++    DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img
+     $testdir/run-qemu \
+ 	-hda $DISKIMAGE \
+ 	-m 256M -nographic \
+@@ -18,6 +18,7 @@ test_run() {
+ 
+ test_setup() {
+     # Create the blank file to use as a root filesystem
++    DISKIMAGE=$TESTDIR/TEST-15-BTRFSRAID-root.img
+     rm -f $DISKIMAGE
+     dd if=/dev/null of=$DISKIMAGE bs=1M seek=1024
+ 
diff --git a/dracut.spec b/dracut.spec
index 8f6f231..c9d5a1a 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 015
-Release: 1%{?dist}
+Release: 3.git20120208%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel} > 6
@@ -24,6 +24,8 @@ 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: 0001-dracut-setup-clean-PATH-w-o-existing-one.patch
+Patch2: 0002-TEST-15-BTRFSRAID-write-diskimage-to-tmp-dir.patch
 
 
 BuildArch: noarch
@@ -307,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Feb 08 2012 Harald Hoyer <harald@redhat.com> 015-3.git20120208
+- update to latest git
+
 * Tue Feb 07 2012 Harald Hoyer <harald@redhat.com> 015-1
 - version 015