From: Alan Pevec <apevec@redhat.com>
Date: Wed, 6 Apr 2011 23:53:51 +0000 (+0200)
Subject: dmsquash-live: hide plymouth while checking ISO
X-Git-Tag: 011~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93724aa28fc20c8b7f0167201d1759b7118ba890;p=thirdparty%2Fdracut.git

dmsquash-live: hide plymouth while checking ISO

Fixes long-standing FIXME
Latest isomd5sum added an option to abort media check with ESC key,
but that key is taken by plymouth for switching to the detailed log
messages, making it impossible to abort checkisomd5.
Tested in text mode.
---

diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root
index 928aff9a8..b5afba903 100755
--- a/modules.d/90dmsquash-live/dmsquash-live-root
+++ b/modules.d/90dmsquash-live/dmsquash-live-root
@@ -25,18 +25,19 @@ getargbool 0 rd.live.overlay.reset -y reset_overlay && reset_overlay="yes"
 getargbool 0 rd.live.overlay.readonly -y readonly_overlay && readonly_overlay="--readonly" || readonly_overlay=""
 overlay=$(getarg rd.live.overlay overlay)
 
-# FIXME: we need to be able to hide the plymouth splash for the check really
 [ -e $livedev ] && fs=$(blkid -s TYPE -o value $livedev)
 if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
     check="yes"
 fi
 getarg rd.live.check check || check=""
 if [ -n "$check" ]; then
+    [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
     checkisomd5 --verbose $livedev || :
     if [ $? -ne 0 ]; then
         die "CD check failed!"
         exit 1
     fi
+    [ -x /bin/plymouth ] && /bin/plymouth --show-splash
 fi
 
 getarg ro && liverw=ro