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

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

2 files changed, 64 insertions, 0 deletions

diff --git a/modules.d/81cio_ignore/module-setup.sh b/modules.d/81cio_ignore/module-setup.sh
new file mode 100755
index 0000000..a54fcb9
--- /dev/null
+++ b/modules.d/81cio_ignore/module-setup.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+# called by dracut
+check() {
+    # do not add this module by default
+    local arch=${DRACUT_ARCH:-$(uname -m)}
+    [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
+    return 0
+}
+
+cmdline() {
+    local cio_accept
+
+    if [ -e /boot/zipl/active_devices.txt ]; then
+        while read -r dev _; do
+            [ "$dev" = "#" -o "$dev" = "" ] && continue
+            if [ -z "$cio_accept" ]; then
+                cio_accept="$dev"
+            else
+                cio_accept="${cio_accept},${dev}"
+            fi
+        done < /boot/zipl/active_devices.txt
+    fi
+    if [ -n "$cio_accept" ]; then
+        echo "rd.cio_accept=${cio_accept}"
+    fi
+}
+
+# called by dracut
+install() {
+    if [[ $hostonly_cmdline == "yes" ]]; then
+        local _cio_accept
+        _cio_accept=$(cmdline)
+        [[ $_cio_accept ]] && printf "%s\n" "$_cio_accept" >> "${initdir}/etc/cmdline.d/01cio_accept.conf"
+    fi
+
+    inst_hook cmdline 20 "$moddir/parse-cio_accept.sh"
+    inst_multiple cio_ignore
+}
diff --git a/modules.d/81cio_ignore/parse-cio_accept.sh b/modules.d/81cio_ignore/parse-cio_accept.sh
new file mode 100755
index 0000000..6cb682a
--- /dev/null
+++ b/modules.d/81cio_ignore/parse-cio_accept.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+CIO_IGNORE=$(getarg cio_ignore)
+CIO_ACCEPT=$(getarg rd.cio_accept)
+
+if [ -z "$CIO_IGNORE" ]; then
+    info "cio_ignored disabled on commandline"
+    return
+fi
+if [ -n "$CIO_ACCEPT" ]; then
+    OLDIFS="$IFS"
+    IFS=,
+    # shellcheck disable=SC2086
+    set -- $CIO_ACCEPT
+    while [ "$#" -gt 0 ]; do
+        info "Enabling device $1"
+        cio_ignore --remove "$1"
+        shift
+    done
+    IFS="$OLDIFS"
+fi