From a0a8881c5ba65a99cdcacb4e44cbb3ca4f5b608a Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Mar 31 2011 06:34:08 +0000
Subject: - fixed dmsquash rule generation

- fixed fips boot arg parsing
- fixed plymouth pid generation

---

diff --git a/0016-fips-fixed-boot-dev-handling.patch b/0016-fips-fixed-boot-dev-handling.patch
new file mode 100644
index 0000000..1df7851
--- /dev/null
+++ b/0016-fips-fixed-boot-dev-handling.patch
@@ -0,0 +1,41 @@
+From 01583ae4ad05519a78cf661ff1104cd9b2910aa7 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 30 Mar 2011 14:50:42 +0200
+Subject: [PATCH] fips: fixed "boot=<dev>" handling
+
+---
+ modules.d/01fips/fips.sh |   16 +++++++---------
+ 1 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
+index febe23e..857c355 100755
+--- a/modules.d/01fips/fips.sh
++++ b/modules.d/01fips/fips.sh
+@@ -4,20 +4,18 @@
+ do_fips()
+ {
+     FIPSMODULES=$(cat /etc/fipsmodules)
+-    BOOT=$(getarg boot=)
++    boot=$(getarg boot=)
+     KERNEL=$(uname -r)
+     case "$boot" in
+-        block:LABEL=*|LABEL=*)
+-            boot="${boot#block:}"
++        LABEL=*)
+             boot="$(echo $boot | sed 's,/,\\x2f,g')"
+             boot="/dev/disk/by-label/${boot#LABEL=}"
+-            bootok=1 ;;
+-        block:UUID=*|UUID=*)
+-            boot="${boot#block:}"
+-            boot="/dev/disk/by-uuid/${root#UUID=}"
+-            bootok=1 ;;
++            ;;
++        UUID=*)
++            boot="/dev/disk/by-uuid/${boot#UUID=}"
++            ;;
+         /dev/*)
+-            bootok=1 ;;
++            ;;
+         *)
+             die "You have to specify boot=<boot device> as a boot option for fips=1" ;;
+     esac
diff --git a/0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch b/0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
new file mode 100644
index 0000000..61fbb28
--- /dev/null
+++ b/0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
@@ -0,0 +1,24 @@
+From 8ee30d09a44601d54567d7d51c84b2d714dd8e0f Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Wed, 30 Mar 2011 16:24:57 +0200
+Subject: [PATCH] plymouth: use /run/plymouth/pid instead of /run/initramfs/plymouth
+
+---
+ modules.d/50plymouth/plymouth-pretrigger.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
+index d560d6f..477975f 100755
+--- a/modules.d/50plymouth/plymouth-pretrigger.sh
++++ b/modules.d/50plymouth/plymouth-pretrigger.sh
+@@ -17,8 +17,8 @@ if getargbool 1 rd.plymouth -n rd_NO_PLYMOUTH; then
+     [ -e /dev/fb ] || ln -s fb0 /dev/fb
+ 
+     info "Starting plymouth daemon"
+-    [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session
+-    >/run/initramfs/plymouth
++    mkdir -m 0755 -p /run/plymouth
++    [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+     [ -x /lib/udev/console_init ] && /lib/udev/console_init tty0
+     /bin/plymouth --show-splash 2>&1 | vinfo
+ fi
diff --git a/0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch b/0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
new file mode 100644
index 0000000..f4b272f
--- /dev/null
+++ b/0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
@@ -0,0 +1,23 @@
+From 98b108284cc62203d3f9cc392b287affdee35305 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 31 Mar 2011 08:24:15 +0200
+Subject: [PATCH] dmsquash-live/dmsquash-live-genrules.sh: fixed udev rule location
+
+Fixed the rule directory to $UDEVRULESD
+---
+ .../90dmsquash-live/dmsquash-live-genrules.sh      |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
+index 1128be4..404d1c5 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
++++ b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
+@@ -8,7 +8,7 @@ case "$root" in
+             ${root#live:/dev/} 
+         printf 'SYMLINK=="%s", SYMLINK+="live"\n' \
+             ${root#live:/dev/} 
+-    } >> /dev/.udev/rules.d/99-live-mount.rules
++    } >> $UDEVRULESD/99-live-mount.rules
+     {
+         printf 'KERNEL=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+             ${root#live:/dev/} 
diff --git a/dracut.spec b/dracut.spec
index 88a31d7..1435afe 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -8,7 +8,7 @@
 
 Name: dracut
 Version: 009
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora}
@@ -33,6 +33,9 @@ Patch12: 0012-base-init-fix-cdrom-polling.patch
 Patch13: 0013-base-dracut-lib.sh-relax-getargbool-value-parsing.patch
 Patch14: 0014-doc-s-init.log-run-initramfs-init.log-g.patch
 Patch15: 0015-base-init-fixed-compat-dev-.initramfs-copy.patch
+Patch16: 0016-fips-fixed-boot-dev-handling.patch
+Patch17: 0017-plymouth-use-run-plymouth-pid-instead-of-run-initram.patch
+Patch18: 0018-dmsquash-live-dmsquash-live-genrules.sh-fixed-udev-r.patch
 
 BuildArch: noarch
 
@@ -179,6 +182,9 @@ This package contains tools to assemble the local initrd and host configuration.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %build
 make WITH_SWITCH_ROOT=0%{?with_switch_root}
@@ -315,6 +321,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Mar 31 2011 Harald Hoyer <harald@redhat.com> 009-4
+- fixed dmsquash rule generation
+- fixed fips boot arg parsing
+- fixed plymouth pid generation
+
 * Wed Mar 30 2011 Harald Hoyer <harald@redhat.com> 009-3
 - fixed dhcp
 - added /lib/firmware/updates to firmware directories