New: [rhinstaller/anaconda/pulls/384 master] Fix issues with the media check

[master 1/2] Fail the media check if the systemd service failed to start.

[dashea]

From: David Shea

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@${p}.service
-                status=$(systemctl -p ExecMainStatus show checkisomd5@${p}.service)
-                splitsep "=" "$status" ignore rc
+                retcode=$(systemctl -p ExecMainStatus show checkisomd5@${p}.service)
+                status=$(systemctl -p ActiveState show checkisomd5@${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

[master 2/2] Mangle the boot device differently for systemd (#1241704)

[dashea]

From: David Shea

systemd no longer accepts a leading '-' character. See also commit
3d579309cde6c02a85ce7d3c396f61e7f064690b in dracut.
---
 dracut/anaconda-diskroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dracut/anaconda-diskroot b/dracut/anaconda-diskroot
index 5981e8a..7e52e05 100755
--- a/dracut/anaconda-diskroot
+++ b/dracut/anaconda-diskroot
@@ -13,7 +13,7 @@ run_checkisomd5() {
         if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
             [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
             if [ -n "$DRACUT_SYSTEMD" ]; then
-                p=$(str_replace "$livedev" "-" '\x2d')
+                p=$(dev_unit_name "$livedev")
                 systemctl start checkisomd5@${p}.service
                 retcode=$(systemctl -p ExecMainStatus show checkisomd5@${p}.service)
                 status=$(systemctl -p ActiveState show checkisomd5@${p}.service)

[rhinstaller/anaconda/pulls/384 master] Fix issues with the media check

[dashea]

Added label: ACK.

[rhinstaller/anaconda/pulls/384 master] Fix issues with the media check

[dashea]

Looks good to me too.

[rhinstaller/anaconda/pulls/384 master] Fix issues with the media check

[dashea]

Closed.

[rhinstaller/anaconda/pulls/384 master] Fix issues with the media check

[dashea]

Pushed to master and f23