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: 041~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=370035d561baa6852bcb02161ef736a78b62b336;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.
---

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 246235be4..d921f0cd6 100755
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
@@ -42,7 +42,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