From c73e7b99db8c759d89236d0791145d6919abd2bc Mon Sep 17 00:00:00 2001 From: Laszlo Gombos Date: Sat, 13 Aug 2022 17:29:11 +0000 Subject: [PATCH] fix(virtiofs): ismounted has a dependency on the base module When dracut.sh is called with "--modules virtiofs", make sure dracut-lib.sh is installed by making the base module a dependency. --- modules.d/95virtiofs/module-setup.sh | 2 +- modules.d/95virtiofs/mount-virtiofs.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules.d/95virtiofs/module-setup.sh b/modules.d/95virtiofs/module-setup.sh index e5f209e0a..6e8e6c3cd 100755 --- a/modules.d/95virtiofs/module-setup.sh +++ b/modules.d/95virtiofs/module-setup.sh @@ -16,7 +16,7 @@ check() { # called by dracut depends() { - return 0 + echo base } # called by dracut diff --git a/modules.d/95virtiofs/mount-virtiofs.sh b/modules.d/95virtiofs/mount-virtiofs.sh index 507911cf5..ddd8dcb88 100755 --- a/modules.d/95virtiofs/mount-virtiofs.sh +++ b/modules.d/95virtiofs/mount-virtiofs.sh @@ -1,5 +1,7 @@ #!/usr/bin/sh +type ismounted > /dev/null 2>&1 || . /lib/dracut-lib.sh + if [ "${fstype}" = "virtiofs" -o "${root%%:*}" = "virtiofs" ]; then if ! { modprobe virtiofs || strstr "$(cat /proc/filesystems)" virtiofs; }; then die "virtiofs is required but not available." -- 2.47.3