[dracut/f21] Fix for rhbz 1147941

[Zbigniew Jędrzejewski-Szmek]

commit f10a0b5e795254bbf8ad7976a385842d17298ca8
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Sep 30 08:18:57 2014 -0400

    Fix for rhbz 1147941

 ...live-treat-cancelled-check-as-successfull.patch |   25 ++++++++++++++++++++
 dracut.spec                                        |    6 ++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0035-dmsquash-live-treat-cancelled-check-as-successfull.patch b/0035-dmsquash-live-treat-cancelled-check-as-successfull.patch
new file mode 100644
index 0000000..4c13cde
--- /dev/null
+++ b/0035-dmsquash-live-treat-cancelled-check-as-successfull.patch
@@ -0,0 +1,25 @@
+From c434437890ee3fd949830b294955318863edce3b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Tue, 30 Sep 2014 07:55:11 -0400
+Subject: [PATCH] dmsquash-live: treat cancelled check as successfull
+
+Also remove JobTimeout=0 setting, it is the default for Type=oneshot.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1147941
+---
+ modules.d/90dmsquash-live/checkisomd5 at .service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90dmsquash-live/checkisomd5 at .service b/modules.d/90dmsquash-live/checkisomd5 at .service
+index 20e40bd7c8..1efb4a7b45 100644
+--- a/modules.d/90dmsquash-live/checkisomd5 at .service
++++ b/modules.d/90dmsquash-live/checkisomd5 at .service
+@@ -10,4 +10,4 @@ ExecStart=/bin/checkisomd5 --verbose %f
+ StandardInput=tty-force
+ StandardOutput=inherit
+ StandardError=inherit
+-TimeoutSec=0
++SuccessExitStatus=2
+-- 
+1.9.3
+
diff --git a/dracut.spec b/dracut.spec
index 369a552..8653b49 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -11,7 +11,7 @@
 
 Name: dracut
 Version: 038
-Release: 29.git20140903%{?dist}
+Release: 30.git20140903%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -58,6 +58,7 @@ Patch25: 0025-dracut-lib.sh-cancel_wait_for_dev-fixed-double-escap.patch
 Patch26: 0026-dracut.spec-fixed-license-file-packaging.patch
 Patch27: 0027-Makefile-rpm-wget-the-lgpl-license-for-Source1.patch
 Patch28: 0028-Enable-early-microcode-by-default.patch
+Patch35: 0035-dmsquash-live-treat-cancelled-check-as-successfull.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
@@ -506,6 +507,9 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 30 2014 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 038-30.git20140903
+- Allow media check to be cancelled (rhbz 1147941)
+
 * Thu Sep 25 2014 Josh Boyer <jwboyer at fedoraproject.org> 038-29.git20140903
 - Enable early-microcode by default (rhbz 1083716)