From: David Shea <dshea(a)redhat.com>
Related: rhbz#1241704
---
dracut/anaconda-diskroot | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/dracut/anaconda-diskroot b/dracut/anaconda-diskroot
index d8ddf92..5981e8a 100755
--- a/dracut/anaconda-diskroot
+++ b/dracut/anaconda-diskroot
@@ -15,16 +15,23 @@ run_checkisomd5() {
if [ -n "$DRACUT_SYSTEMD" ]; then
p=$(str_replace "$livedev" "-" '\x2d')
systemctl start checkisomd5(a)${p}.service
- status=$(systemctl -p ExecMainStatus show checkisomd5(a)${p}.service)
- splitsep "=" "$status" ignore rc
+ retcode=$(systemctl -p ExecMainStatus show checkisomd5(a)${p}.service)
+ status=$(systemctl -p ActiveState show checkisomd5(a)${p}.service)
+ splitsep "=" "$retcode" ignore rc
+ splitsep "=" "$status" ignore state
else
checkisomd5 --verbose $livedev
rc=$?
+ state="inactive"
fi
if [ "$rc" == "1" ]; then
die "CD check failed!"
exit 1
fi
+ if [ "$state" = "failed" ]; then
+ die "CD check failed!"
+ exit 1
+ fi
[ -x /bin/plymouth ] && /bin/plymouth --show-splash
fi
fi
--
To view this commit on github, visit
https://github.com/rhinstaller/anaconda/commit/198467bea8f02529af2815286e...