From fbba0445db72eec71fc2e21191ecebbcb9eac0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
Date: Tue, 24 Sep 2019 17:48:39 +0200
Subject: [PATCH] Fixed kiwi-live module setup

The installation of the checkmedia tool is optional and
and not mandatory. In addition activate the media check
verification also through the upstream used rd.live.check
kernel parameter. This is related to Issue #1158
---
 dracut/modules.d/90kiwi-live/kiwi-live-checkmedia.sh | 2 +-
 dracut/modules.d/90kiwi-live/module-setup.sh         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dracut/modules.d/90kiwi-live/kiwi-live-checkmedia.sh b/dracut/modules.d/90kiwi-live/kiwi-live-checkmedia.sh
index 0de2281b..8cbf020b 100755
--- a/dracut/modules.d/90kiwi-live/kiwi-live-checkmedia.sh
+++ b/dracut/modules.d/90kiwi-live/kiwi-live-checkmedia.sh
@@ -2,7 +2,7 @@
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 type runMediaCheck >/dev/null 2>&1 || . /lib/kiwi-live-lib.sh
 
-if getargbool 0 mediacheck; then
+if getargbool 0 mediacheck || getargbool 0 rd.live.check; then
     declare root=${root}
     initGlobalDevices "${root#live:}"
     runMediaCheck
diff --git a/dracut/modules.d/90kiwi-live/module-setup.sh b/dracut/modules.d/90kiwi-live/module-setup.sh
index 9f5f9906..9c620fe7 100755
--- a/dracut/modules.d/90kiwi-live/module-setup.sh
+++ b/dracut/modules.d/90kiwi-live/module-setup.sh
@@ -25,10 +25,11 @@ install() {
     declare systemdutildir=${systemdutildir}
     declare dracutbasedir=${dracutbasedir}
     local dmsquashdir=
+    inst_multiple -o checkmedia
     inst_multiple \
         umount dmsetup blockdev blkid lsblk dd losetup \
         grep cut partprobe find wc fdisk tail mkfs.ext4 mkfs.xfs \
-        checkmedia dialog cat
+        dialog cat
 
     dmsquashdir=$(find "${dracutbasedir}/modules.d" -name "*dmsquash-live")
     if [ -n "${dmsquashdir}" ] && \