From: Harald Hoyer <harald@redhat.com>
Date: Tue, 25 Nov 2014 12:44:54 +0000 (+0100)
Subject: dmsquash-live: do not abort, if user pressed ESC on checkisomd5
X-Git-Tag: RHEL-7.2~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2af6708641bb896f0c117ae49906783cfd46f0a8;p=thirdparty%2Fdracut.git

dmsquash-live: do not abort, if user pressed ESC on checkisomd5

If the user pressed ESC while checkisomd5 runs the media check, it will
exit with "2". Previously that would mean, that the media check was not
successful.

(cherry picked from commit 370035d561baa6852bcb02161ef736a78b62b336)
---

diff --git a/modules.d/90dmsquash-live/checkisomd5@.service b/modules.d/90dmsquash-live/checkisomd5@.service
index 20e40bd7c..c4ca10f3c 100644
--- a/modules.d/90dmsquash-live/checkisomd5@.service
+++ b/modules.d/90dmsquash-live/checkisomd5@.service
@@ -11,3 +11,4 @@ StandardInput=tty-force
 StandardOutput=inherit
 StandardError=inherit
 TimeoutSec=0
+SuccessExitStatus=2
diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
index 64abc0be1..8d5476cd7 100755
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
@@ -46,7 +46,7 @@ if [ -n "$check" ]; then
     else
         checkisomd5 --verbose $livedev
     fi
-    if [ $? -ne 0 ]; then
+    if [ $? -eq 1 ]; then
         die "CD check failed!"
         exit 1
     fi