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