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
This commit is contained in:
Marcus Schäfer 2019-09-24 17:48:39 +02:00
parent 4ddffd50b1
commit fbba0445db
No known key found for this signature in database
GPG Key ID: AD11DD02B44996EF
2 changed files with 3 additions and 2 deletions

View File

@ -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

View File

@ -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}" ] && \