From 72b05d9ec21e7f00f4ad3077e1c779dfd51bf725 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sep 30 2014 12:18:57 +0000
Subject: Fix for rhbz 1147941


---

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@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@.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90dmsquash-live/checkisomd5@.service b/modules.d/90dmsquash-live/checkisomd5@.service
+index 20e40bd7c8..1efb4a7b45 100644
+--- a/modules.d/90dmsquash-live/checkisomd5@.service
++++ b/modules.d/90dmsquash-live/checkisomd5@.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 d7f4da2..44a8f05 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -11,7 +11,7 @@
 
 Name: dracut
 Version: 038
-Release: 35.git20140815%{?dist}
+Release: 36.git20140815%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -64,6 +64,7 @@ Patch31: 0031-51-dracut-rescue.install-fixed-proc-cmdline-read.patch
 Patch32: 0032-50-dracut.install-fixed-proc-cmdline-reading.patch
 Patch33: 0033-50-dracut.install-install-pregenerated-initrd.patch
 Patch34: 0034-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
 
@@ -512,11 +513,14 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Fri Sep 26 2014 Josh Boyer <jwboyer@fedoraproject.org>
+* Tue Sep 30 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 038-36.git20140815
+- Allow media check to be cancelled (rhbz 1147941)
+
+* Fri Sep 26 2014 Josh Boyer <jwboyer@fedoraproject.org> - 038-35.git20140815
 - Enable early-microcode by default (rhbz 1083716)
 - Fix changelog date
 
-* Tue Aug 19 2014 Harald Hoyer <harald@redhat.com> 038-34.git20140815
+* Tue Aug 19 2014 Harald Hoyer <harald@redhat.com> - 038-34.git20140815
 - git snapshot
 
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 038-31.git20140815