Blame SOURCES/0274-dmsquash-live-do-not-abort-if-user-pressed-ESC-on-ch.patch

64b87c
From 2af6708641bb896f0c117ae49906783cfd46f0a8 Mon Sep 17 00:00:00 2001
64b87c
From: Harald Hoyer <harald@redhat.com>
64b87c
Date: Tue, 25 Nov 2014 13:44:54 +0100
64b87c
Subject: [PATCH] dmsquash-live: do not abort, if user pressed ESC on
64b87c
 checkisomd5
64b87c
64b87c
If the user pressed ESC while checkisomd5 runs the media check, it will
64b87c
exit with "2". Previously that would mean, that the media check was not
64b87c
successful.
64b87c
64b87c
(cherry picked from commit 370035d561baa6852bcb02161ef736a78b62b336)
64b87c
---
64b87c
 modules.d/90dmsquash-live/checkisomd5@.service  | 1 +
64b87c
 modules.d/90dmsquash-live/dmsquash-live-root.sh | 2 +-
64b87c
 2 files changed, 2 insertions(+), 1 deletion(-)
64b87c
64b87c
diff --git a/modules.d/90dmsquash-live/checkisomd5@.service b/modules.d/90dmsquash-live/checkisomd5@.service
64b87c
index 20e40bd..c4ca10f 100644
64b87c
--- a/modules.d/90dmsquash-live/checkisomd5@.service
64b87c
+++ b/modules.d/90dmsquash-live/checkisomd5@.service
64b87c
@@ -11,3 +11,4 @@ StandardInput=tty-force
64b87c
 StandardOutput=inherit
64b87c
 StandardError=inherit
64b87c
 TimeoutSec=0
64b87c
+SuccessExitStatus=2
64b87c
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
64b87c
index 64abc0b..8d5476c 100755
64b87c
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
64b87c
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
64b87c
@@ -46,7 +46,7 @@ if [ -n "$check" ]; then
64b87c
     else
64b87c
         checkisomd5 --verbose $livedev
64b87c
     fi
64b87c
-    if [ $? -ne 0 ]; then
64b87c
+    if [ $? -eq 1 ]; then
64b87c
         die "CD check failed!"
64b87c
         exit 1
64b87c
     fi