Adding upstream version 060+5.upstream/060+5

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 60 insertions, 0 deletions

diff --git a/modules.d/95virtiofs/module-setup.sh b/modules.d/95virtiofs/module-setup.sh
new file mode 100755
index 0000000..176482b
--- /dev/null
+++ b/modules.d/95virtiofs/module-setup.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# called by dracut
+check() {
+    [[ $hostonly ]] || [[ $mount_needs ]] && {
+        is_qemu_virtualized && return 0
+
+        for fs in "${host_fs_types[@]}"; do
+            [[ $fs == "virtiofs" ]] && return 0
+        done
+        return 255
+    }
+
+    return 0
+}
+
+# called by dracut
+depends() {
+    echo base
+}
+
+# called by dracut
+installkernel() {
+    instmods virtiofs virtio_pci
+}
+
+# called by dracut
+install() {
+    inst_hook cmdline 95 "$moddir/parse-virtiofs.sh"
+    inst_hook pre-mount 99 "$moddir/mount-virtiofs.sh"
+}
diff --git a/modules.d/95virtiofs/mount-virtiofs.sh b/modules.d/95virtiofs/mount-virtiofs.sh
new file mode 100755
index 0000000..3d73884
--- /dev/null
+++ b/modules.d/95virtiofs/mount-virtiofs.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+type ismounted > /dev/null 2>&1 || . /lib/dracut-lib.sh
+
+if [ "${fstype}" = "virtiofs" -o "${root%%:*}" = "virtiofs" ]; then
+    if ! load_fstype virtiofs; then
+        die "virtiofs is required but not available."
+    fi
+
+    mount -t virtiofs -o "$rflags" "${root#virtiofs:}" "$NEWROOT" 2>&1 | vinfo
+    if ! ismounted "$NEWROOT"; then
+        die "virtiofs: failed to mount root fs"
+    fi
+
+    info "virtiofs: root fs mounted (options: '${rflags}')"
+
+    [ -f "$NEWROOT"/forcefsck ] && rm -f -- "$NEWROOT"/forcefsck 2> /dev/null
+    [ -f "$NEWROOT"/.autofsck ] && rm -f -- "$NEWROOT"/.autofsck 2> /dev/null
+fi
+:
diff --git a/modules.d/95virtiofs/parse-virtiofs.sh b/modules.d/95virtiofs/parse-virtiofs.sh
new file mode 100755
index 0000000..760e413
--- /dev/null
+++ b/modules.d/95virtiofs/parse-virtiofs.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Accepted formats:
+# 	rootfstype=virtiofs root=<tag>
+# 	root=virtiofs:<tag>
+
+if [ "${fstype}" = "virtiofs" -o "${root%%:*}" = "virtiofs" ]; then
+    # shellcheck disable=SC2034
+    rootok=1
+fi