[dracut/f18] dracut-024-16.git20121220

[Harald Hoyer]

commit cec399fa5e4bf96bee8bc7464a8d5bb744f004ca
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Dec 20 13:53:17 2012 +0100

    dracut-024-16.git20121220
    
    - fixed mediacheck
    Resolves: rhbz#874486

 ...quash-live-fixed-checkisomd5-service-call.patch |   34 ++++++++++++++++++++
 dracut.spec                                        |    7 +++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0015-dmsquash-live-fixed-checkisomd5-service-call.patch b/0015-dmsquash-live-fixed-checkisomd5-service-call.patch
new file mode 100644
index 0000000..fd64f93
--- /dev/null
+++ b/0015-dmsquash-live-fixed-checkisomd5-service-call.patch
@@ -0,0 +1,34 @@
+From b8add77970099e12e205bb836d611defb4e3c7be Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 20 Dec 2012 13:46:31 +0100
+Subject: [PATCH] dmsquash-live: fixed checkisomd5 service call
+
+---
+ modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 +-
+ modules.d/90dmsquash-live/module-setup.sh       | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+index ec22977..f302d44 100755
+--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
++++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
+@@ -32,7 +32,7 @@ fi
+ getarg rd.live.check -d check || check=""
+ if [ -n "$check" ]; then
+     [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+-    if [ -n "DRACUT_SYSTEMD" ]; then
++    if [ -n "$DRACUT_SYSTEMD" ]; then
+         p=$(str_replace "$livedev" "-" '\x2d')
+         systemctl start checkisomd5@${p}.service
+     else
+diff --git a/modules.d/90dmsquash-live/module-setup.sh b/modules.d/90dmsquash-live/module-setup.sh
+index 3339e1d..931c7e7 100755
+--- a/modules.d/90dmsquash-live/module-setup.sh
++++ b/modules.d/90dmsquash-live/module-setup.sh
+@@ -29,5 +29,6 @@ install() {
+     inst_script "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root"
+     # should probably just be generally included
+     inst_rules 60-cdrom_id.rules
++    inst_simple "$moddir/checkisomd5 at .service" "${dracutsystemunitdir}/checkisomd5 at .service"
+ }
+ 
diff --git a/dracut.spec b/dracut.spec
index 46a2eb1..d6d4cf7 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 024
-Release: 15.git20121218%{?dist}
+Release: 16.git20121220%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -43,6 +43,7 @@ Patch11: 0011-add-swapoff-to-initramfs-to-fix-shutdown-reboot.patch
 Patch12: 0012-dracut.spec-add-iputils-and-iproute-requirement-for-.patch
 Patch13: 0013-nfs-nfsroot-cleanup.sh-mount-bind-instead-of-move.patch
 Patch14: 0014-iscsi-iscsiroot.sh-reload-rules-after-adding-99-iscs.patch
+Patch15: 0015-dmsquash-live-fixed-checkisomd5-service-call.patch
 
 
 BuildRequires: dash bash git
@@ -378,6 +379,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Dec 20 2012 Harald Hoyer <harald at redhat.com> 024-16.git20121220
+- fixed mediacheck
+Resolves: rhbz#874486
+
 * Tue Dec 18 2012 Harald Hoyer <harald at redhat.com> 024-15.git20121218
 - fixed mediacheck
 Resolves: rhbz#874486