.dracut.metadata

@@ -1 +0,0 @@
-62ab5e53c734ad6ec77ebf0580383e8b6de96d16 SOURCES/dracut-049.tar.xz

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1 @@
-SOURCES/dracut-049.tar.xz
+/*.tar.*

0001-revert-fix-install.d-correctly-install-pre-genned-im.patch

@@ -0,0 +1,239 @@
+From a9afc62a54034b452c974a2c6dfa959031566e61 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Wed, 12 Jun 2024 06:30:42 +0200
+Subject: [PATCH 01/16] revert: "fix(install.d): correctly install pre-genned
+ image and die if no args"
+
+revert: "fix(install.d): simplify and use what kernel-install gives us"
+
+This reverts commits:
+  d40155385d060f8d8608fa8a4931e2e42ddc3a8f
+  8388ad149c698c951089606352fdb0cdcaaf40c9
+
+https://github.com/dracut-ng/dracut-ng/issues/334
+
+This is temporary, until the `20-grub.install` will be able to handle initrd
+from kernel staging area.
+---
+ install.d/50-dracut.install        | 153 ++++++++++++++++++-----------
+ install.d/51-dracut-rescue.install |  22 +----
+ 2 files changed, 97 insertions(+), 78 deletions(-)
+
+diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
+index 6019e8d8..441414ac 100755
+--- a/install.d/50-dracut.install
++++ b/install.d/50-dracut.install
+@@ -1,13 +1,13 @@
+ #!/bin/bash
+ 
+-COMMAND="${1:?}"
+-KERNEL_VERSION="${2:?}"
+-#shellcheck disable=SC2034
++COMMAND="$1"
++KERNEL_VERSION="$2"
+ BOOT_DIR_ABS="$3"
+ KERNEL_IMAGE="$4"
+ 
+-# If the initrd was provided on the kernel command line, we shouldn't generate our own.
+-if [[ "$COMMAND" != "add" || "$#" -gt 4 ]]; then
++# If KERNEL_INSTALL_MACHINE_ID is defined but empty, BOOT_DIR_ABS is a fake directory.
++# So, let's skip to create initrd.
++if ! [[ ${KERNEL_INSTALL_MACHINE_ID-x} ]]; then
+     exit 0
+ fi
+ 
+@@ -16,65 +16,102 @@ if [[ "$KERNEL_INSTALL_IMAGE_TYPE" = "uki" ]]; then
+     exit 0
+ fi
+ 
+-if [[ "${KERNEL_INSTALL_INITRD_GENERATOR:-dracut}" = "dracut" ]]; then
+-    # We are the initrd generator
+-    IMAGE="initrd"
+-    UEFI_OPTS="--no-uefi"
++# Mismatching the install layout and the --uefi/--no-uefi opts just creates a mess.
++if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
++    BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
++    if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
++        # No uki generator preference set or we have been chosen
++        IMAGE="uki.efi"
++        UEFI_OPTS="--uefi"
++    elif [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
++        # We aren't the uki generator, but we have been requested to make the initrd
++        IMAGE="initrd"
++        UEFI_OPTS="--no-uefi"
++    else
++        exit 0
++    fi
++elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
++    BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
++    if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
++        IMAGE="initrd"
++        UEFI_OPTS="--no-uefi"
++    else
++        exit 0
++    fi
+ else
+-    exit 0
++    # No layout information, use users --uefi/--no-uefi preference
++    UEFI_OPTS=""
++    if [[ -d $BOOT_DIR_ABS ]]; then
++        IMAGE="initrd"
++    else
++        BOOT_DIR_ABS="/boot"
++        IMAGE="initramfs-${KERNEL_VERSION}.img"
++    fi
+ fi
+ 
+-if [[ "$KERNEL_INSTALL_UKI_GENERATOR" = "dracut" ]]; then
+-    # We are chosen to generate the UKI as well as initrd
+-    IMAGE="uki.efi"
+-    UEFI_OPTS="--uefi"
+-fi
++ret=0
+ 
+-if [[ -f ${KERNEL_IMAGE%/*}/$IMAGE ]]; then
+-    # we found an initrd or uki.efi at the same place as the kernel
+-    # use this and don't generate a new one
+-    [[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo \
+-        "There is an $IMAGE image at the same place as the kernel, skipping generating a new one"
+-    cp --reflink=auto "${KERNEL_IMAGE%/*}/$IMAGE" "$KERNEL_INSTALL_STAGING_AREA/$IMAGE" \
+-        && chown root:root "$KERNEL_INSTALL_STAGING_AREA/$IMAGE" \
+-        && chmod 0600 "$KERNEL_INSTALL_STAGING_AREA/$IMAGE" \
+-        && exit 0
+-fi
++case "$COMMAND" in
++    add)
++        if [[ $IMAGE == "uki.efi" ]]; then
++            IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/uki.efi
++        else
++            IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/initrd
++        fi
++        if [[ -f ${IMAGE_PREGENERATED} ]]; then
++            # we found an initrd or uki.efi at the same place as the kernel
++            # use this and don't generate a new one
++            [[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo \
++                "There is an ${IMAGE} image at the same place as the kernel, skipping generating a new one"
++            cp --reflink=auto "$IMAGE_PREGENERATED" "$BOOT_DIR_ABS/$IMAGE" \
++                && chown root:root "$BOOT_DIR_ABS/$IMAGE" \
++                && chmod 0600 "$BOOT_DIR_ABS/$IMAGE" \
++                && exit 0
++        fi
+ 
+-if [ -n "$KERNEL_INSTALL_CONF_ROOT" ]; then
+-    if [ -f "$KERNEL_INSTALL_CONF_ROOT/cmdline" ]; then
+-        read -r -d '' -a BOOT_OPTIONS < "$KERNEL_INSTALL_CONF_ROOT/cmdline"
+-    fi
+-elif [[ -f /etc/kernel/cmdline ]]; then
+-    read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
+-elif [[ -f /usr/lib/kernel/cmdline ]]; then
+-    read -r -d '' -a BOOT_OPTIONS < /usr/lib/kernel/cmdline
+-else
+-    declare -a BOOT_OPTIONS
++        if [ -n "$KERNEL_INSTALL_CONF_ROOT" ]; then
++            if [ -f "$KERNEL_INSTALL_CONF_ROOT/cmdline" ]; then
++                read -r -d '' -a BOOT_OPTIONS < "$KERNEL_INSTALL_CONF_ROOT/cmdline"
++            fi
++        elif [[ -f /etc/kernel/cmdline ]]; then
++            read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
++        elif [[ -f /usr/lib/kernel/cmdline ]]; then
++            read -r -d '' -a BOOT_OPTIONS < /usr/lib/kernel/cmdline
++        else
++            declare -a BOOT_OPTIONS
+ 
+-    read -r -d '' -a line < /proc/cmdline
+-    for i in "${line[@]}"; do
+-        [[ ${i#initrd=*} != "$i" ]] && continue
+-        BOOT_OPTIONS+=("$i")
+-    done
+-fi
++            read -r -d '' -a line < /proc/cmdline
++            for i in "${line[@]}"; do
++                [[ ${i#initrd=*} != "$i" ]] && continue
++                BOOT_OPTIONS+=("$i")
++            done
++        fi
+ 
+-unset noimageifnotneeded
++        unset noimageifnotneeded
+ 
+-for ((i = 0; i < "${#BOOT_OPTIONS[@]}"; i++)); do
+-    # shellcheck disable=SC1001
+-    if [[ ${BOOT_OPTIONS[$i]} == root\=PARTUUID\=* ]]; then
+-        noimageifnotneeded="yes"
+-        break
+-    fi
+-done
++        for ((i = 0; i < "${#BOOT_OPTIONS[@]}"; i++)); do
++            # shellcheck disable=SC1001
++            if [[ ${BOOT_OPTIONS[$i]} == root\=PARTUUID\=* ]]; then
++                noimageifnotneeded="yes"
++                break
++            fi
++        done
++
++        # shellcheck disable=SC2046
++        dracut -f \
++            ${noimageifnotneeded:+--noimageifnotneeded} \
++            $([[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo --verbose) \
++            $([[ -n $KERNEL_IMAGE ]] && echo --kernel-image "$KERNEL_IMAGE") \
++            "$UEFI_OPTS" \
++            --kver "$KERNEL_VERSION" \
++            "$BOOT_DIR_ABS/$IMAGE"
++        ret=$?
++        ;;
++
++    remove)
++        rm -f -- "$BOOT_DIR_ABS/$IMAGE"
++        ret=$?
++        ;;
++esac
+ 
+-# shellcheck disable=SC2046
+-dracut -f \
+-    --add-confdir hostonly \
+-    ${noimageifnotneeded:+--noimageifnotneeded} \
+-    $([[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo --verbose) \
+-    $([[ -n $KERNEL_IMAGE ]] && echo --kernel-image "$KERNEL_IMAGE") \
+-    "$UEFI_OPTS" \
+-    --kver "$KERNEL_VERSION" \
+-    "$KERNEL_INSTALL_STAGING_AREA/$IMAGE" || exit 1
++exit $ret
+diff --git a/install.d/51-dracut-rescue.install b/install.d/51-dracut-rescue.install
+index 4ec9e3c5..9312e242 100755
+--- a/install.d/51-dracut-rescue.install
++++ b/install.d/51-dracut-rescue.install
+@@ -2,29 +2,11 @@
+ 
+ export LANG=C
+ 
+-COMMAND="${1:?}"
+-KERNEL_VERSION="${2:?}"
++COMMAND="$1"
++KERNEL_VERSION="$2"
+ BOOT_DIR_ABS="${3%/*}/0-rescue"
+ KERNEL_IMAGE="$4"
+ 
+-# If the initrd was provided on the kernel command line, we shouldn't generate our own.
+-if [[ "$COMMAND" = "add" && "$#" -gt 4 ]]; then
+-    exit 0
+-fi
+-
+-# Do not attempt to create initramfs if the supplied image is already a UKI
+-if [[ "$KERNEL_INSTALL_IMAGE_TYPE" = "uki" ]]; then
+-    exit 0
+-fi
+-
+-if [[ "$KERNEL_INSTALL_UKI_GENERATOR" = "dracut" ]]; then
+-    # Rescue images currently not compatible with UKIs
+-    exit 0
+-elif [[ "${KERNEL_INSTALL_INITRD_GENERATOR:-dracut}" != "dracut" ]]; then
+-    # We are not the initrd generator
+-    exit 0
+-fi
+-
+ dropindirs_sort() {
+     suffix=$1
+     shift
+-- 
+2.50.1
+

0002-feat-kernel-install-do-nothing-when-KERNEL_INSTALL_I.patch

@@ -0,0 +1,72 @@
+From ae9180bd95fcfc2b01475dac3ddf05cd3011d484 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 18 Jan 2022 18:08:42 +0100
+Subject: [PATCH 02/16] feat(kernel-install): do nothing when
+ $KERNEL_INSTALL_INITRD_GENERATOR says so
+
+dracut may be installed without being actually used. This is very common in
+binary distros where a package may be pulled in through dependencies, even
+though the user does not need it in a particular setup. KERNEL_INSTALL_INITRD_GENERATOR
+is being added in systemd's kernel-install to select which of the possibly many
+initrd generation mechanisms will be used.
+
+For backwards compat, if it not set, continue as before. But if set to
+something else, skip our kernel-install plugins.
+
+(Cherry-picked commit f47bcdd7342ca0d46b889e712a1c7446e18434bc from PR#1825)
+---
+ install.d/50-dracut.install        | 9 ++++++++-
+ install.d/51-dracut-rescue.install | 6 ++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
+index 441414ac..3f961b11 100755
+--- a/install.d/50-dracut.install
++++ b/install.d/50-dracut.install
+@@ -6,11 +6,17 @@ BOOT_DIR_ABS="$3"
+ KERNEL_IMAGE="$4"
+ 
+ # If KERNEL_INSTALL_MACHINE_ID is defined but empty, BOOT_DIR_ABS is a fake directory.
+-# So, let's skip to create initrd.
++# In this case, do not create the initrd.
+ if ! [[ ${KERNEL_INSTALL_MACHINE_ID-x} ]]; then
+     exit 0
+ fi
+ 
++# Skip this plugin if we're using a different generator. If nothing is specified,
++# assume we're wanted since we're installed.
++if [ "${KERNEL_INSTALL_INITRD_GENERATOR:-dracut}" != "dracut" ]; then
++    exit 0
++fi
++
+ # Do not attempt to create initramfs if the supplied image is already a UKI
+ if [[ "$KERNEL_INSTALL_IMAGE_TYPE" = "uki" ]]; then
+     exit 0
+@@ -38,6 +44,7 @@ elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; t
+     else
+         exit 0
+     fi
++
+ else
+     # No layout information, use users --uefi/--no-uefi preference
+     UEFI_OPTS=""
+diff --git a/install.d/51-dracut-rescue.install b/install.d/51-dracut-rescue.install
+index 9312e242..decee283 100755
+--- a/install.d/51-dracut-rescue.install
++++ b/install.d/51-dracut-rescue.install
+@@ -7,6 +7,12 @@ KERNEL_VERSION="$2"
+ BOOT_DIR_ABS="${3%/*}/0-rescue"
+ KERNEL_IMAGE="$4"
+ 
++# Skip this plugin if we're using a different generator. If nothing is specified,
++# assume we're wanted since we're installed.
++if [ "${KERNEL_INSTALL_INITRD_GENERATOR:-dracut}" != "dracut" ]; then
++    exit 0
++fi
++
+ dropindirs_sort() {
+     suffix=$1
+     shift
+-- 
+2.50.1
+

0003-fix-kernel-install-do-not-generate-an-initrd-when-on.patch

@@ -0,0 +1,39 @@
+From 65705f91734f79d157d1365cef1ce8eb988996b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 18 Jan 2022 18:58:58 +0100
+Subject: [PATCH 03/16] fix(kernel-install): do not generate an initrd when one
+ was specified
+
+According to the synopsis, kernel-install can be called with an
+already-prepared initrd. In that case, no initrd should be generated by dracut.
+
+(Cherry-picked commit 0b72cf5c4eca0e0db76e3e210cfdc48e6b49bb74 from PR#1825)
+---
+ install.d/50-dracut.install | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
+index 3f961b11..076b4f5e 100755
+--- a/install.d/50-dracut.install
++++ b/install.d/50-dracut.install
+@@ -4,6 +4,7 @@ COMMAND="$1"
+ KERNEL_VERSION="$2"
+ BOOT_DIR_ABS="$3"
+ KERNEL_IMAGE="$4"
++INITRD_OPTIONS_SHIFT=4
+ 
+ # If KERNEL_INSTALL_MACHINE_ID is defined but empty, BOOT_DIR_ABS is a fake directory.
+ # In this case, do not create the initrd.
+@@ -60,6 +61,9 @@ ret=0
+ 
+ case "$COMMAND" in
+     add)
++        # If the initrd was provided on the kernel command line, we shouldn't generate our own.
++        [ "$#" -gt "$INITRD_OPTIONS_SHIFT" ] && exit 0
++
+         if [[ $IMAGE == "uki.efi" ]]; then
+             IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/uki.efi
+         else
+-- 
+2.50.1
+

0004-fix-resume-always-include-the-resume-module.patch

@@ -0,0 +1,51 @@
+From 8b0520da9fd68cfb47a128610949636ec88876ef Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Thu, 8 Aug 2024 00:21:12 +0200
+Subject: [PATCH 04/16] fix(resume): always include the resume module
+
+as we can't determine with certainity that it won't be needed.
+
+rhel-only
+
+Resolves: RHEL-53350
+
+(commit messages from squashed commits:)
+
+fix(resume): do not include resume if swap is on netdevice
+
+Additional fix, restoring previous behavior identical to RHEL-9.
+
+rhel-only
+
+Resolves: RHEL-53350
+---
+ modules.d/95resume/module-setup.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
+index d419566e..785f681a 100755
+--- a/modules.d/95resume/module-setup.sh
++++ b/modules.d/95resume/module-setup.sh
+@@ -1,7 +1,9 @@
+ #!/bin/bash
+ 
+ # called by dracut
++# shellcheck disable=SC2317
+ check() {
++
+     swap_on_netdevice() {
+         local _dev
+         for _dev in "${swap_devs[@]}"; do
+@@ -18,6 +20,9 @@ check() {
+             # hibernation support requested on kernel command line
+             return 0
+         else
++            # always include resume module when not on netdevice
++            return 0
++
+             # resume= not set on kernel command line
+             if [[ -f /sys/power/resume ]]; then
+                 if [[ "$(< /sys/power/resume)" == "0:0" ]]; then
+-- 
+2.50.1
+

0005-feat-lsinitrd.sh-look-for-initrd-in-usr-lib-modules.patch

@@ -0,0 +1,38 @@
+From 87f4fba8e038e9ba16daf6bf89d20d6be4063998 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Fri, 16 Aug 2024 20:40:15 +0200
+Subject: [PATCH 05/16] feat(lsinitrd.sh): look for initrd in /usr/lib/modules/
+
+Introduce new path for lsinitrd.sh to look into:
+
+/usr/lib/modules/$kver/initramfs.img
+
+Which is valid on all ostree-based systems, and also other image based
+systems with pre-generated initramfs.
+
+Ref: https://issues.redhat.com/browse/RHEL-35890
+(cherry picked from commit 22ae6ecaf9ecdb9db3e79aa9a72d527e7436c282)
+
+Resolves: RHEL-54650
+---
+ lsinitrd.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lsinitrd.sh b/lsinitrd.sh
+index ea26a260..3f719201 100755
+--- a/lsinitrd.sh
++++ b/lsinitrd.sh
+@@ -133,6 +133,10 @@ find_initrd_for_kernel_version() {
+         echo "/lib/modules/${kernel_version}/initrd"
+     elif [[ -f /lib/modules/${kernel_version}/initramfs.img ]]; then
+         echo "/lib/modules/${kernel_version}/initramfs.img"
++    elif [[ -f /usr/lib/modules/${kernel_version}/initrd ]]; then
++        echo "/usr/lib/modules/${kernel_version}/initrd"
++    elif [[ -f /usr/lib/modules/${kernel_version}/initramfs.img ]]; then
++        echo "/usr/lib/modules/${kernel_version}/initramfs.img"
+     elif [[ -f /boot/initramfs-${kernel_version}.img ]]; then
+         echo "/boot/initramfs-${kernel_version}.img"
+     elif [[ -f /usr/lib/modules/${kernel_version}/initramfs.img ]]; then
+-- 
+2.50.1
+

0006-feat-fips-include-fips-module-unconditionally.patch

@@ -1,17 +1,17 @@
-From b61af7e8c89d2b9625fd7e6285168231c0cf2d03 Mon Sep 17 00:00:00 2001
+From 456b922e1610316d3b5980a9749eee62b9b0db34 Mon Sep 17 00:00:00 2001
 From: Pavel Valena <pvalena@redhat.com>
 Date: Mon, 19 Aug 2024 09:41:27 +0200
-Subject: [PATCH] feat(fips): include fips module unconditionally
+Subject: [PATCH 06/16] feat(fips): include fips module unconditionally
 
 rhel-only
 
-Resolves: RHEL-53355
+Resolves: RHEL-39404
 ---
  modules.d/01fips/module-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index 71bea53a..66eac19f 100755
+index ed4ef20b..60b044ed 100755
 --- a/modules.d/01fips/module-setup.sh
 +++ b/modules.d/01fips/module-setup.sh
 @@ -2,7 +2,7 @@
@@ -23,4 +23,6 @@ index 71bea53a..66eac19f 100755
  }
  
  # called by dracut
+-- 
+2.50.1
 

0007-build-upgrade-to-dracut-105.patch

@@ -0,0 +1,136 @@
+From 88796914fa725c674196c63109fdc3fdae2f0e9d Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Fri, 7 Feb 2025 08:37:27 +0100
+Subject: [PATCH 07/31] build: upgrade to dracut 105
+
+also add .dist/rebase.sh tool to help with rebases.
+
+Resolves: RHEL-65204
+---
+ test/TEST-60-NFS/test.sh            | 3 ++-
+ test/TEST-61-MULTINIC/test.sh       | 2 +-
+ test/TEST-62-BONDBRIDGEVLAN/test.sh | 2 +-
+ test/TEST-70-ISCSI/test.sh          | 4 ++--
+ test/TEST-71-ISCSI-MULTI/test.sh    | 4 ++--
+ test/TEST-72-NBD/test.sh            | 6 +++---
+ 6 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
+index cd1689e4..f6efea36 100755
+--- a/test/TEST-60-NFS/test.sh
++++ b/test/TEST-60-NFS/test.sh
+@@ -375,8 +375,9 @@ test_setup() {
+     )
+     # Make server's dracut image
+     "$DRACUT" -i "$TESTDIR"/overlay / \
+-        -a "network-legacy ${SERVER_DEBUG:+debug}" \
++        -a "network ${SERVER_DEBUG:+debug}" \
+         -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod i6300esb virtio_net" \
++
+         --no-hostonly-cmdline -N \
+         -f "$TESTDIR"/initramfs.server "$KVERSION"
+ }
+diff --git a/test/TEST-61-MULTINIC/test.sh b/test/TEST-61-MULTINIC/test.sh
+index 367d7d24..5dcd931e 100755
+--- a/test/TEST-61-MULTINIC/test.sh
++++ b/test/TEST-61-MULTINIC/test.sh
+@@ -358,7 +358,7 @@ test_setup() {
+     )
+     # Make server's dracut image
+     "$DRACUT" -i "$TESTDIR"/overlay / \
+-        -m "bash rootfs-block kernel-modules watchdog qemu network-legacy ${SERVER_DEBUG:+debug}" \
++        -m "bash rootfs-block kernel-modules watchdog qemu network ${SERVER_DEBUG:+debug}" \
+         -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd i6300esb virtio_net" \
+         --no-hostonly-cmdline -N \
+         -f "$TESTDIR"/initramfs.server "$KVERSION"
+diff --git a/test/TEST-62-BONDBRIDGEVLAN/test.sh b/test/TEST-62-BONDBRIDGEVLAN/test.sh
+index 5188c099..1f3878b1 100755
+--- a/test/TEST-62-BONDBRIDGEVLAN/test.sh
++++ b/test/TEST-62-BONDBRIDGEVLAN/test.sh
+@@ -393,7 +393,7 @@ test_setup() {
+     # Make server's dracut image
+     "$DRACUT" -i "$TESTDIR"/overlay / \
+         --no-early-microcode \
+-        -m "rootfs-block kernel-modules watchdog qemu network network-legacy ${SERVER_DEBUG:+debug}" \
++        -m "rootfs-block kernel-modules watchdog qemu network network ${SERVER_DEBUG:+debug}" \
+         -d "ipvlan macvlan af_packet piix ide-gd_mod ata_piix ext4 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd virtio-net i6300esb" \
+         --no-hostonly-cmdline -N \
+         -f "$TESTDIR"/initramfs.server "$KVERSION"
+diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
+index ff27da53..879b7bd8 100755
+--- a/test/TEST-70-ISCSI/test.sh
++++ b/test/TEST-70-ISCSI/test.sh
+@@ -173,7 +173,7 @@ test_setup() {
+     # Create what will eventually be the server root filesystem onto an overlay
+     "$DRACUT" -N --keep --tmpdir "$TESTDIR" \
+         --add-confdir test-root \
+-        -a network-legacy \
++        -a "${USE_NETWORK}" \
+         -d "iscsi_tcp crc32c ipv6" \
+         -I "modprobe chmod ip setsid pidof tgtd tgtadm /etc/passwd" \
+         --install-optional "/etc/netconfig dhcpd /etc/group /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/services /usr/etc/nsswitch.conf /usr/etc/rpc /usr/etc/protocols /usr/etc/services" \
+@@ -210,7 +210,7 @@ test_setup() {
+ 
+     # Make server's dracut image
+     "$DRACUT" \
+-        -a "test network-legacy" \
++        -a "test network" \
+         -d "piix ide-gd_mod ata_piix ext4 sd_mod drbg virtio_net virtio_pci virtio_scsi" \
+         -i "./server.link" "/etc/systemd/network/01-server.link" \
+         -i ./wait-if-server.sh /lib/dracut/hooks/pre-mount/99-wait-if-server.sh \
+diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh
+index 2950fc14..0c37c7cc 100755
+--- a/test/TEST-71-ISCSI-MULTI/test.sh
++++ b/test/TEST-71-ISCSI-MULTI/test.sh
+@@ -183,7 +183,7 @@ test_setup() {
+     rm -rf -- "$TESTDIR"/overlay
+     "$DRACUT" -N --keep --tmpdir "$TESTDIR" \
+         --add-confdir test-root \
+-        -a "network-legacy iscsi" \
++        -a "${USE_NETWORK} iscsi" \
+         -d "iscsi_tcp crc32c ipv6 af_packet" \
+         -I "ip grep sleep setsid chmod modprobe pidof tgtd tgtadm" \
+         --install-optional "/etc/netconfig dhcpd /etc/group /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/services /usr/etc/nsswitch.conf /usr/etc/rpc /usr/etc/protocols /usr/etc/services" \
+@@ -228,7 +228,7 @@ test_setup() {
+ 
+     # Make server's dracut image
+     "$DRACUT" -i "$TESTDIR"/overlay / \
+-        -a "test rootfs-block kernel-modules network-legacy ${SERVER_DEBUG:+debug}" \
++        -a "test rootfs-block kernel-modules network ${SERVER_DEBUG:+debug}" \
+         -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod drbg virtio_net" \
+         -i "./server.link" "/etc/systemd/network/01-server.link" \
+         -i "./wait-if-server.sh" "/lib/dracut/hooks/pre-mount/99-wait-if-server.sh" \
+diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh
+index e25f449e..3f05b09c 100755
+--- a/test/TEST-72-NBD/test.sh
++++ b/test/TEST-72-NBD/test.sh
+@@ -277,7 +277,7 @@ EOF
+ 
+     "$DRACUT" --keep --tmpdir "$TESTDIR" \
+         --add-confdir test-root \
+-        -a "network-legacy" \
++        -a "network" \
+         -I "ip grep sleep nbd-server chmod modprobe pidof" \
+         --install-optional "/etc/netconfig dhcpd /etc/group /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/services /usr/etc/nsswitch.conf /usr/etc/rpc /usr/etc/protocols /usr/etc/services" \
+         -i /tmp/config /etc/nbd-server/config \
+@@ -295,7 +295,7 @@ EOF
+     # devices, volume groups, encrypted partitions, etc.
+     "$DRACUT" -N -i "$TESTDIR"/overlay / \
+         --add-confdir test-makeroot \
+-        -a "network-legacy" \
++        -a "${USE_NETWORK}" \
+         -i ./create-server-root.sh /lib/dracut/hooks/initqueue/01-create-server-root.sh \
+         --nomdadmconf \
+         --no-hostonly-cmdline -N \
+@@ -338,7 +338,7 @@ test_setup() {
+         -i "/tmp/key" "/etc/key"
+ 
+     "$DRACUT" -N -i "$TESTDIR"/overlay / \
+-        -a "test network-legacy ${SERVER_DEBUG:+debug}" \
++        -a "test network ${SERVER_DEBUG:+debug}" \
+         -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod drbg virtio_net" \
+         -i "./server.link" "/etc/systemd/network/01-server.link" \
+         -i "./wait-if-server.sh" "/lib/dracut/hooks/pre-mount/99-wait-if-server.sh" \
+-- 
+2.52.0
+

0008-revert-fix-rescue-make-rescue-always-no-hostonly.patch

@@ -0,0 +1,30 @@
+From ea8bbaac7b4e0d91acc2d1a192d87b3f328e5808 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Wed, 29 Jan 2025 20:25:03 +0100
+Subject: [PATCH 08/31] revert: "fix(rescue): make rescue always no-hostonly"
+
+This partly reverts commit 224c00914bfb4ba1dee48e094ebb137facfd5947.
+
+Related: RHEL-65204
+---
+ install.d/51-dracut-rescue.install | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/install.d/51-dracut-rescue.install b/install.d/51-dracut-rescue.install
+index decee283..1be9b882 100755
+--- a/install.d/51-dracut-rescue.install
++++ b/install.d/51-dracut-rescue.install
+@@ -119,8 +119,8 @@ case "$COMMAND" in
+ 
+         if [[ ! -f "$BOOT_DIR_ABS/$INITRD" ]]; then
+             # shellcheck disable=SC2046
+-            dracut -f \
+-                --add-confdir rescue \
++            dracut -f --no-hostonly --no-uefi \
++                -a "rescue" \
+                 $([[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo --verbose) \
+                 --kver "$KERNEL_VERSION" \
+                 "$BOOT_DIR_ABS/$INITRD"
+-- 
+2.52.0
+

0009-fix-dracut-install-initize-fts-pointer.patch

@@ -0,0 +1,26 @@
+From 0466276d2dabc86dde6ac2ce4f5b6387292bc377 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Thu, 13 Feb 2025 22:18:06 +0100
+Subject: [PATCH 09/31] fix(dracut-install): initize fts pointer
+
+Related: RHEL-65204
+---
+ src/install/dracut-install.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
+index bacbe86e..bd72f0b9 100644
+--- a/src/install/dracut-install.c
++++ b/src/install/dracut-install.c
+@@ -1703,7 +1703,7 @@ static void find_suppliers_for_sys_node(Hashmap *suppliers, const char *node_pat
+ 
+ static void find_suppliers(struct kmod_ctx *ctx)
+ {
+-        _cleanup_fts_close_ FTS *fts;
++        _cleanup_fts_close_ FTS *fts = NULL;
+         char *paths[] = { "/sys/devices/platform", NULL };
+         fts = fts_open(paths, FTS_NOSTAT | FTS_PHYSICAL, NULL);
+ 
+-- 
+2.52.0
+

0011-fix-openssl-harden-ossl-build-CFLAGS.patch

@@ -0,0 +1,26 @@
+From 18de7972b688001e73924a693d0bcd8c83e79f06 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Mon, 17 Feb 2025 06:58:26 +0100
+Subject: [PATCH 11/31] fix(openssl): harden ossl build CFLAGS
+
+Related: RHEL-76323
+---
+ src/ossl/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ossl/Makefile b/src/ossl/Makefile
+index 17b418c2..200dcbb5 100644
+--- a/src/ossl/Makefile
++++ b/src/ossl/Makefile
+@@ -1,7 +1,7 @@
+ .PHONY: all clean tests
+ 
+ CFLAGS ?= -std=c99 -Wall -Werror -pedantic -D_XOPEN_SOURCE=600
+-CRYPTO_FLAGS = -lcrypto
++CRYPTO_FLAGS = -lcrypto -Wl,-pie -Wl,-z,now
+ TARGETS = src/ossl-config src/ossl-files
+ 
+ TESTS_CONFIG = $(wildcard tests/config/*.cnf)
+-- 
+2.52.0
+

0012-fix-ossl-copy-executables-for-the-test-suite.patch

@@ -0,0 +1,85 @@
+From 1f5c47ebd37d4f493cb4eab6e955ca8e04c3ef89 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Mon, 17 Feb 2025 17:31:35 +0100
+Subject: [PATCH 12/31] fix(ossl): copy executables for the test suite
+
+and also fix CFLAGS in case of std=c99.
+
+Related: RHEL-76323
+---
+ Makefile          | 20 ++++++++++++--------
+ src/ossl/Makefile |  2 +-
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f10f72d7..dd12e8cc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -88,11 +88,14 @@ util/util: $(UTIL_OBJECTS)
+ dracut-util: src/util/util
+ 	cp -a $< $@
+ 
+-ossl: src/ossl/Makefile
++ossl:
+ 	$(MAKE) -C src/ossl
+ 
+ ossl-config: ossl
++	cp -a src/ossl/src/ossl-config $@
++
+ ossl-files: ossl
++	cp -a src/ossl/src/ossl-files $@
+ 
+ .PHONY: indent-c
+ indent-c:
+@@ -216,20 +219,20 @@ endif
+ 			$(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$$i; \
+ 		done \
+ 	fi
+-	if [ -f src/install/dracut-install ]; then \
++	if [ -r src/install/dracut-install ]; then \
+ 		install -m 0755 src/install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
+ 	fi
+-	if [ -f src/skipcpio/skipcpio ]; then \
++	if [ -r src/skipcpio/skipcpio ]; then \
+ 		install -m 0755 src/skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
+ 	fi
+-	if [ -f dracut-util ]; then \
++	if [ -r dracut-util ]; then \
+ 		install -m 0755 dracut-util $(DESTDIR)$(pkglibdir)/dracut-util; \
+ 	fi
+-	if [ -f src/ossl/src/ossl-config ]; then \
+-		install -m 0755 src/ossl/src/ossl-config $(DESTDIR)$(pkglibdir)/ossl-config; \
++	if [ -r ossl-config ]; then \
++		install -m 0755 ossl-config $(DESTDIR)$(pkglibdir)/ossl-config; \
+ 	fi
+-	if [ -f src/ossl/src/ossl-files ]; then \
+-		install -m 0755 src/ossl/src/ossl-files $(DESTDIR)$(pkglibdir)/ossl-files; \
++	if [ -r ossl-files ]; then \
++		install -m 0755 ossl-files $(DESTDIR)$(pkglibdir)/ossl-files; \
+ 	fi
+ ifeq ($(enable_dracut_cpio),yes)
+ 	install -m 0755 dracut-cpio $(DESTDIR)$(pkglibdir)/dracut-cpio
+@@ -263,6 +266,7 @@ clean:
+ 	$(RM) dracut.pc
+ 	$(RM) dracut-cpio src/dracut-cpio/target/release/dracut-cpio*
+ 	$(RM) -rf build/ doc_site/modules/ROOT/pages/man/*
++	$(RM) ossl-files ossl-config
+ 	$(MAKE) -C test clean
+ 	$(MAKE) -C src/ossl clean
+ 
+diff --git a/src/ossl/Makefile b/src/ossl/Makefile
+index 200dcbb5..43e7b464 100644
+--- a/src/ossl/Makefile
++++ b/src/ossl/Makefile
+@@ -1,7 +1,7 @@
+ .PHONY: all clean tests
+ 
+ CFLAGS ?= -std=c99 -Wall -Werror -pedantic -D_XOPEN_SOURCE=600
+-CRYPTO_FLAGS = -lcrypto -Wl,-pie -Wl,-z,now
++CRYPTO_FLAGS = -lcrypto -Wl,-pie -Wl,-z,now -fPIE
+ TARGETS = src/ossl-config src/ossl-files
+ 
+ TESTS_CONFIG = $(wildcard tests/config/*.cnf)
+-- 
+2.52.0
+

0013-fix-rescue-create-hmac-file-for-rescue-kernel.patch

@@ -1,18 +1,18 @@
-From 4cbaead393233e6967bd804d57cbd0d73b992431 Mon Sep 17 00:00:00 2001
+From 13333e5c47d8b9cadb8a1ba881a39c05be186553 Mon Sep 17 00:00:00 2001
 From: Pavel Valena <pvalena@redhat.com>
-Date: Thu, 6 Mar 2025 14:30:26 +0100
+Date: Thu, 6 Mar 2025 14:23:27 +0100
-Subject: [PATCH] fix(rescue): create hmac file for rescue kernel
+Subject: [PATCH 13/31] fix(rescue): create hmac file for rescue kernel
 
-Resolves: RHEL-53364
+Resolves: RHEL-59543
 ---
- 51-dracut-rescue.install | 11 +++++++++++
+ install.d/51-dracut-rescue.install | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
-diff --git a/51-dracut-rescue.install b/51-dracut-rescue.install
+diff --git a/install.d/51-dracut-rescue.install b/install.d/51-dracut-rescue.install
-index 47eb8e7d..e50468dd 100755
+index 1be9b882..030f45ba 100755
---- a/51-dracut-rescue.install
+--- a/install.d/51-dracut-rescue.install
-+++ b/51-dracut-rescue.install
++++ b/install.d/51-dracut-rescue.install
-@@ -89,6 +89,17 @@ case "$COMMAND" in
+@@ -117,6 +117,17 @@ case "$COMMAND" in
              echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/$KERNEL'!" >&2
          fi
  
@@ -28,6 +28,8 @@ index 47eb8e7d..e50468dd 100755
 +        fi
 +
          if [[ ! -f "$BOOT_DIR_ABS/$INITRD" ]]; then
-             dracut -f --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
+             # shellcheck disable=SC2046
-             ((ret+=$?))
+             dracut -f --no-hostonly --no-uefi \
+-- 
+2.52.0
 

0014-Revert-feat-systemd-sysusers-run-systemd-sysusers-as.patch

@@ -0,0 +1,100 @@
+From ad54db31bbe6c006d44c1890a48ddea69c0c2529 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 11 Jul 2025 01:37:09 -0700
+Subject: [PATCH 14/31] Revert "feat(systemd-sysusers): run systemd-sysusers as
+ part  of the build process"
+
+This reverts commit f3dacc013d90bd2c0bbfa04f5f9b167b65298440.
+It breaks kernel builds on Fedora - see
+https://bugzilla.redhat.com/show_bug.cgi?id=2379116 .
+
+Related: RHEL-97473
+---
+ modules.d/01systemd-sysusers/module-setup.sh  | 31 +++++++++++++++++++
+ .../01systemd-sysusers/sysusers-dracut.conf   |  2 ++
+ modules.d/99systemd-sysusers/module-setup.sh  | 26 ----------------
+ 3 files changed, 33 insertions(+), 26 deletions(-)
+ create mode 100755 modules.d/01systemd-sysusers/module-setup.sh
+ create mode 100644 modules.d/01systemd-sysusers/sysusers-dracut.conf
+ delete mode 100755 modules.d/99systemd-sysusers/module-setup.sh
+
+diff --git a/modules.d/01systemd-sysusers/module-setup.sh b/modules.d/01systemd-sysusers/module-setup.sh
+new file mode 100755
+index 00000000..4c6b39d7
+--- /dev/null
++++ b/modules.d/01systemd-sysusers/module-setup.sh
+@@ -0,0 +1,31 @@
++#!/bin/bash
++# This file is part of dracut.
++# SPDX-License-Identifier: GPL-2.0-or-later
++
++# Prerequisite check(s) for module.
++check() {
++    # If the binary(s) requirements are not fulfilled the module can't be installed.
++    require_binaries systemd-sysusers || return 1
++
++    # Return 255 to only include the module, if another module requires it.
++    return 255
++}
++
++# Install the required file(s) and directories for the module in the initramfs.
++install() {
++    inst_simple "$moddir/sysusers-dracut.conf" "$systemdsystemunitdir/systemd-sysusers.service.d/sysusers-dracut.conf"
++
++    inst_sysusers basic.conf
++
++    inst_multiple -o \
++        "$systemdsystemunitdir"/systemd-sysusers.service \
++        "$systemdsystemunitdir"/sysinit.target.wants/systemd-sysusers.service \
++        systemd-sysusers
++
++    # Install the hosts local user configurations if enabled.
++    if [[ $hostonly ]]; then
++        inst_multiple -H -o \
++            "$systemdsystemconfdir"/systemd-sysusers.service \
++            "$systemdsystemconfdir/systemd-sysusers.service.d/*.conf"
++    fi
++}
+diff --git a/modules.d/01systemd-sysusers/sysusers-dracut.conf b/modules.d/01systemd-sysusers/sysusers-dracut.conf
+new file mode 100644
+index 00000000..9b13364b
+--- /dev/null
++++ b/modules.d/01systemd-sysusers/sysusers-dracut.conf
+@@ -0,0 +1,2 @@
++[Unit]
++ConditionNeedsUpdate=
+diff --git a/modules.d/99systemd-sysusers/module-setup.sh b/modules.d/99systemd-sysusers/module-setup.sh
+deleted file mode 100755
+index c1ef40cd..00000000
+--- a/modules.d/99systemd-sysusers/module-setup.sh
++++ /dev/null
+@@ -1,26 +0,0 @@
+-#!/bin/bash
+-# This file is part of dracut.
+-# SPDX-License-Identifier: GPL-2.0-or-later
+-
+-# This module should be orders afer all modules that depends on it
+-# This is to make sure that all inst_sysusers calls are in place before systemd-sysusers is called.
+-
+-# Prerequisite check(s) for module.
+-check() {
+-    # If the binary(s) requirements are not fulfilled the module can't be installed.
+-    require_binaries systemd-sysusers || return 1
+-
+-    # Return 255 to only include the module, if another module requires it.
+-    return 255
+-}
+-
+-# Install the required file(s) and directories for the module in the initramfs.
+-install() {
+-    inst_sysusers basic.conf
+-
+-    # redirect stdout temporarily to FD 3 to use filter stderr
+-    {
+-        set -o pipefail
+-        systemd-sysusers --root="$initdir" 2>&1 >&3 | grep -v "^Creating " >&2
+-    } 3>&1
+-}
+-- 
+2.52.0
+

0015-Revert-chore-remove-unused-function.patch

@@ -0,0 +1,49 @@
+From 0baf5e0b6c1370b51a20327bd67e0260fc9f8f2e Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Thu, 10 Jul 2025 10:33:21 -0700
+Subject: [PATCH 15/31] Revert "chore: remove unused function"
+
+This reverts commit 81ddde54051351ea17dbb84ef6232820f96740af.
+dracut itself may not use inst_library, but external modules do,
+at least anaconda's does.
+
+(cherry picked from commit da64b204418753abce4090892831429c03239fa7)
+
+Related: RHEL-97473
+---
+ dracut-init.sh | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/dracut-init.sh b/dracut-init.sh
+index 9be00c56..749801fc 100755
+--- a/dracut-init.sh
++++ b/dracut-init.sh
+@@ -350,6 +350,25 @@ dracut_instmods() {
+     fi
+ }
+ 
++# this is not used within dracut itself, but external modules use it,
++# do not remove it!
++inst_library() {
++    local _ret _hostonly_install
++    if [[ $1 == "-H" ]]; then
++        _hostonly_install="-H"
++        shift
++    fi
++    [[ -e ${initdir}/"${2:-$1}" ]] && return 0 # already there
++    [[ -e $1 ]] || return 1                    # no source
++    if $DRACUT_INSTALL ${dracutsysrootdir:+-r "$dracutsysrootdir"} ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@"; then
++        return 0
++    else
++        _ret=$?
++        derror FAILED: "$DRACUT_INSTALL" ${dracutsysrootdir:+-r "$dracutsysrootdir"} ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@"
++        return $_ret
++    fi
++}
++
+ inst_binary() {
+     local _ret
+     if $DRACUT_INSTALL ${dracutsysrootdir:+-r "$dracutsysrootdir"} ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@"; then
+-- 
+2.52.0
+

0016-fix-ossl-ignore-compiler-warnings.patch

@@ -0,0 +1,34 @@
+From e0d1d0707c4694219b6d44d417c4c4e6a0fdc94c Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Wed, 2 Apr 2025 10:45:51 +0200
+Subject: [PATCH 16/31] fix(ossl): ignore compiler warnings
+
+```
+src/ossl-files.c:37:8: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
+
+src/ossl-files.c:38:34: error: comparison of integer expressions of different signedness: 'size_t' {aka 'long unsigned int'} and 'int' [-Werror=sign-compare]
+src/ossl-files.c:109:34: error: comparison of integer expressions of different signedness: 'size_t' {aka 'long unsigned int'} and 'int' [-Werror=sign-compare]
+src/ossl-files.c:150:34: error: comparison of integer expressions of different signedness: 'size_t' {aka 'long unsigned int'} and 'int' [-Werror=sign-compare]
+```
+
+Related: RHEL-97473
+---
+ src/ossl/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ossl/Makefile b/src/ossl/Makefile
+index 43e7b464..2e76d52a 100644
+--- a/src/ossl/Makefile
++++ b/src/ossl/Makefile
+@@ -1,7 +1,7 @@
+ .PHONY: all clean tests
+ 
+ CFLAGS ?= -std=c99 -Wall -Werror -pedantic -D_XOPEN_SOURCE=600
+-CRYPTO_FLAGS = -lcrypto -Wl,-pie -Wl,-z,now -fPIE
++CRYPTO_FLAGS = -lcrypto -Wl,-pie -Wl,-z,now -fPIE -pie -fPIC -Wno-ignored-qualifiers -Wno-sign-compare
+ TARGETS = src/ossl-config src/ossl-files
+ 
+ TESTS_CONFIG = $(wildcard tests/config/*.cnf)
+-- 
+2.52.0
+

0017-fix-improve-hostonly-sloppy-mode.patch

@@ -0,0 +1,40 @@
+From 36d81322f0bcc2ff92cd7c1bee9a0c175b988693 Mon Sep 17 00:00:00 2001
+From: Jo Zzsi <jozzsicsataban@gmail.com>
+Date: Sun, 11 May 2025 21:16:42 -0400
+Subject: [PATCH 17/31] fix: improve hostonly sloppy mode
+
+Resolve regression introduced by 8519dcd.
+
+Fixes #1321 .
+
+(cherry picked from commit bcf0093945b8d7b45006f410c52402450062a993)
+
+Related: RHEL-97473
+---
+ modules.d/90kernel-modules/module-setup.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 72fbc41f..2daacb93 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -122,11 +122,11 @@ installkernel() {
+ 
+         # if not on strict hostonly mode, install all known filesystems,
+         # if the required list is not set via the filesystems variable
+-        if [[ $hostonly_mode != "strict" ]]; then
+-            if [[ -z $filesystems ]]; then
+-                dracut_instmods -o -P ".*/(kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd)/.*" '=fs'
+-            fi
+-        elif [[ "${host_fs_types[*]}" ]]; then
++        if [[ $hostonly_mode != "strict" ]] && [[ -z $filesystems ]]; then
++            dracut_instmods -o -P ".*/(kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd)/.*" '=fs'
++        fi
++
++        if [[ $hostonly ]] && [[ "${host_fs_types[*]}" ]]; then
+             hostonly='' instmods "${host_fs_types[@]}"
+         fi
+ 
+-- 
+2.52.0
+

0018-fix-dracut.sh-don-t-pass-empty-string-as-dir.patch

@@ -0,0 +1,36 @@
+From dcd5368818a3a428c1e86690ef26ba8e3e887014 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 20 May 2025 09:31:52 +0200
+Subject: [PATCH 18/31] fix(dracut.sh): don't pass empty string as dir
+
+That causes dropindirs_sort() to look for .conf files in / due to
+expansion:
+
+    for d in "$@"; do
+        for i in "$d/"*"$suffix"; do
+
+Fixes #1275
+
+(cherry picked from commit 000cfa0c278c0858e81c8dd2ff7231f069f0afb1)
+
+Resolves: RHEL-95897
+---
+ dracut.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index c2b2c949..3b8b0435 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -972,7 +972,7 @@ if [[ -f $conffile ]]; then
+ fi
+ 
+ # source our config dir
+-for f in $(dropindirs_sort ".conf" "$confdir" "$add_confdir" "$dracutbasedir/dracut.conf.d"); do
++for f in $(dropindirs_sort ".conf" "$confdir" ${add_confdir:+"$add_confdir"} "$dracutbasedir/dracut.conf.d"); do
+     check_conf_file "$f"
+     # shellcheck disable=SC1090
+     [[ -e $f ]] && . "$f"
+-- 
+2.52.0
+

0019-feat-systemd-drop-unnecessary-dependency-on-libgcryp.patch

@@ -0,0 +1,38 @@
+From 639a04bca8cc22a0b3f0e52fc60ec28e911e1189 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Mon, 4 Aug 2025 23:26:14 +0200
+Subject: [PATCH 19/31] feat(systemd): drop unnecessary dependency on libgcrypt
+
+Resolves: RHEL-95542
+---
+ modules.d/00systemd/module-setup.sh          | 1 -
+ modules.d/01systemd-journald/module-setup.sh | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
+index 8f25475e..482bdfa1 100755
+--- a/modules.d/00systemd/module-setup.sh
++++ b/modules.d/00systemd/module-setup.sh
+@@ -144,7 +144,6 @@ EOF
+     # Install library file(s)
+     _arch=${DRACUT_ARCH:-$(uname -m)}
+     inst_libdir_file \
+-        {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
+         {"tls/$_arch/",tls/,"$_arch/",}"libbpf.so*" \
+         {"tls/$_arch/",tls/,"$_arch/",}"libnss_*" \
+         {"tls/$_arch/",tls/,"$_arch/",}"systemd/libsystemd*.so"
+diff --git a/modules.d/01systemd-journald/module-setup.sh b/modules.d/01systemd-journald/module-setup.sh
+index 77d6a2e9..01a71741 100755
+--- a/modules.d/01systemd-journald/module-setup.sh
++++ b/modules.d/01systemd-journald/module-setup.sh
+@@ -54,7 +54,6 @@ install() {
+     # Install library file(s)
+     _arch=${DRACUT_ARCH:-$(uname -m)}
+     inst_libdir_file \
+-        {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
+         {"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \
+         {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \
+         {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*"
+-- 
+2.52.0
+

0020-fix-kernel-modules-extra-remove-stray-before.patch

@@ -0,0 +1,31 @@
+From ad1ac0f85f4228ea25d38c8e50bf5ef0b59fadcf Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Mon, 4 Aug 2025 23:48:59 +0200
+Subject: [PATCH 20/31] fix(kernel-modules-extra): remove stray \ before /
+
+Fixes grep warning:
+```grep: warning: stray \ before /```
+
+Introduced in grep version 3.11.
+
+Resolves: RHEL-97473
+---
+ modules.d/90kernel-modules-extra/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90kernel-modules-extra/module-setup.sh b/modules.d/90kernel-modules-extra/module-setup.sh
+index 85e2e0ad..c2809356 100755
+--- a/modules.d/90kernel-modules-extra/module-setup.sh
++++ b/modules.d/90kernel-modules-extra/module-setup.sh
+@@ -35,7 +35,7 @@ installkernel() {
+     # Escape a string for usage as a part of extended regular expression.
+     # $1 - string to escape
+     re_escape() {
+-        printf "%s" "$1" | sed 's/\([.+?^$\/\\|()\[]\|\]\)/\\\0/'
++        printf "%s" "$1" | sed 's/\([.+?^$\\|()\[]\|\]\)/\\\0/'
+     }
+ 
+     local cfg
+-- 
+2.52.0
+

0021-Revert-fix-base-do-not-require-chroot-inside-initram.patch

@@ -0,0 +1,30 @@
+From 6fe66a3d55682de7dc24ee8be31752ae2ea08082 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Tue, 5 Aug 2025 00:00:30 +0200
+Subject: [PATCH 21/31] Revert "fix(base): do not require chroot inside
+ initramfs"
+
+This reverts commit 518133714b769160448a51c512d5e152ea6332da.
+
+rhel-only
+
+Resolves: RHEL-93173
+---
+ modules.d/99base/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
+index 7292ba71..9403706a 100755
+--- a/modules.d/99base/module-setup.sh
++++ b/modules.d/99base/module-setup.sh
+@@ -9,6 +9,7 @@ depends() {
+ # called by dracut
+ install() {
+     inst_multiple \
++        chroot \
+         cp \
+         dmesg \
+         flock \
+-- 
+2.52.0
+

0022-fix-let-check_vol_slaves_all-return-1-when-checks-on.patch

@@ -0,0 +1,55 @@
+From f7c8c809798d5980d182509f9e1a448a7c65af73 Mon Sep 17 00:00:00 2001
+From: Coiby Xu <coxu@redhat.com>
+Date: Mon, 26 May 2025 15:34:30 +0800
+Subject: [PATCH 22/31] fix: let check_vol_slaves_all return 1 when checks on
+ all slaves fail
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Currently check_vol_slaves_all return 0 even after checks on all slaves
+fail. And this leads to an issue that "dracut -hostonly-mode strict"
+gets stuck forever because instmods keeps waiting for user input when
+it's passed empty argument in the kernel-modules module.
+
+Fixes: c7c8c498 ("dracut-functions.sh: catch all lvm slaves")
+Reported-by: Tomáš Bžatek <tbzatek@redhat.com>
+Signed-off-by: Coiby Xu <coxu@redhat.com>
+
+(cherry picked from commit 1fcfb2bffdad22873a804043eeeb9bb65a99caa8)
+
+Resolves: RHEL-104223
+---
+ dracut-functions.sh | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 94f0228f..8eadc345 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -685,7 +685,7 @@ check_vol_slaves() {
+ }
+ 
+ check_vol_slaves_all() {
+-    local _vg _pv _majmin _dm
++    local _vg _pv _majmin _dm _ret=1
+     _majmin="$2"
+     _dm=$(get_lvm_dm_dev "$_majmin")
+     [[ -z $_dm ]] && return 1 # not an LVM device-mapper device
+@@ -699,11 +699,10 @@ check_vol_slaves_all() {
+         fi
+ 
+         for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2> /dev/null); do
+-            check_block_and_slaves_all "$1" "$(get_maj_min "$_pv")"
++            check_block_and_slaves_all "$1" "$(get_maj_min "$_pv")" && _ret=0
+         done
+-        return 0
+     fi
+-    return 1
++    return $_ret
+ }
+ 
+ # fs_get_option <filesystem options> <search for option>
+-- 
+2.52.0
+

0023-improvement-74nvmf-lookup-required-NIC-kernel-module.patch

@@ -0,0 +1,45 @@
+From ad715d9108148a25b003df7dd0b3013104d6d717 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Tue, 3 Jun 2025 18:34:39 +0200
+Subject: [PATCH 23/31] improvement(74nvmf): lookup required NIC kernel modules
+ for NBFT interfaces
+
+When dracut is called with '--hostonly-mode strict' and perhaps even
+with --hostonly-nics '' as done by kdump/mkdumprd, all the kernel
+modules related to hostonly networking are stripped down. In such
+a case it is viable to lookup and install the required kernel modules
+ourselves, based on any currently present nbft interfaces.
+
+Note: the lookup depends on the current 'nbftX' network interface
+naming.
+
+Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
+(cherry picked from commit e949a76aaa8f1a1e4cb01d4cacf89c69c7bbd801)
+
+Resolves: RHEL-104223
+---
+ modules.d/95nvmf/module-setup.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/modules.d/95nvmf/module-setup.sh b/modules.d/95nvmf/module-setup.sh
+index b9888a56..9962ce41 100755
+--- a/modules.d/95nvmf/module-setup.sh
++++ b/modules.d/95nvmf/module-setup.sh
+@@ -72,6 +72,14 @@ installkernel() {
+     instmods nvme_fc nvme_tcp nvme_rdma lpfc qla2xxx
+     # 802.1q VLAN may be set up in Firmware later. Include the module always.
+     hostonly="" instmods 8021q
++    # lookup NIC kernel modules for active NBFT interfaces
++    if [[ $hostonly ]]; then
++        for i in /sys/class/net/nbft*; do
++            [ -d "$i" ] || continue
++            _driver=$(basename "$(readlink -f "$i/device/driver/module")")
++            [ -z "$_driver" ] || instmods "$_driver"
++        done
++    fi
+ }
+ 
+ # called by dracut
+-- 
+2.52.0
+

0024-fix-74nvmf-set-root-nvmf.patch

@@ -0,0 +1,38 @@
+From 575585575b6309fc3563e58856d6c8f54df0f4a1 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Tue, 24 Jun 2025 16:50:31 +0200
+Subject: [PATCH 24/31] fix(74nvmf): set root=nvmf
+
+In a restricted image like kdump the kernel commandline argument root=
+is typically absent. However it is required by the 45net-lib/netroot.sh
+module that fails with:
+
+    [   23.599862] dracut: FATAL: No or empty root= argument
+    [   23.604956] dracut: Refusing to continue
+
+Inspired by the 74iscsi module, let's set it to root=nvmf if not set
+before.
+
+Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>
+(cherry picked from commit a6dce328ea9738a558db848fa8dbed253b15ee3d)
+
+Resolves: RHEL-104223
+---
+ modules.d/95nvmf/parse-nvmf-boot-connections.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/modules.d/95nvmf/parse-nvmf-boot-connections.sh b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
+index aad2a458..5288553f 100755
+--- a/modules.d/95nvmf/parse-nvmf-boot-connections.sh
++++ b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
+@@ -326,3 +326,7 @@ fi
+ 
+ /sbin/initqueue --settled --onetime --name nvmf-connect-settled /sbin/nvmf-autoconnect.sh settled
+ /sbin/initqueue --timeout --onetime --name nvmf-connect-timeout /sbin/nvmf-autoconnect.sh timeout
++
++# shellcheck disable=SC2034
++rootok=1
++[ -z "$root" ] && root="nvmf"
+-- 
+2.52.0
+

0025-test-SYSTEMD-INITRD-be-more-careful-with-set-e-and-s.patch

@@ -0,0 +1,59 @@
+From 7edb5a72481052de7da5827ddf2dcb665e5a4ca4 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <frantisek@sumsal.cz>
+Date: Wed, 6 Aug 2025 16:22:34 +0200
+Subject: [PATCH 25/31] test(SYSTEMD-INITRD): be more careful with `set -e` and
+ subshells
+
+When the condition in the subshell fails (i.e. none of the
+dracut*.service files is found), it doesn't trigger shell exit due to
+`set -e` as it's a part of a larger condition (&& ...), but since it's
+the last command of that subshell, it sets the subshell error code to 1.
+This is then treated by the parent shell as an error and the test is
+incorrectly interrupted and marked as failed.
+
+For comparison:
+
+$ (set -ex; echo begin; (for f in dracut*.service; do [[ -e "$f" ]] && echo fail; done); echo end); echo $?
++ echo begin
+begin
++ for f in dracut*.service
++ [[ -e dracut*.service ]]
+1
+
+$ (set -ex; echo begin; (for f in dracut*.service; do if [[ -e "$f" ]]; then echo nope; fi; done); echo end); echo $?
++ echo begin
+begin
++ for f in dracut*.service
++ [[ -e dracut*.service ]]
++ echo end
+end
+0
+
+Follow-up for 80350104949708c60806a255765e87d7b1d5a98c
+
+(cherry picked from commit 6fcb4f37b8c40a5085e631bf79f862b0f062ef1a)
+
+Resolves: RHEL-108215
+---
+ test/TEST-42-SYSTEMD-INITRD/test.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/TEST-42-SYSTEMD-INITRD/test.sh b/test/TEST-42-SYSTEMD-INITRD/test.sh
+index 34ddcbd6..51dc82fb 100755
+--- a/test/TEST-42-SYSTEMD-INITRD/test.sh
++++ b/test/TEST-42-SYSTEMD-INITRD/test.sh
+@@ -90,7 +90,10 @@ test_setup() {
+     (
+         cd "$TESTDIR"/initrd/dracut.*/initramfs/usr/lib/systemd/system/
+         for f in dracut*.service; do
+-            [ -e "$f" ] && echo "unexpected dracut service found: $f" && return 1
++            if [ -e "$f" ]; then
++                echo "unexpected dracut service found: $f"
++                return 1
++            fi
+         done
+     )
+ 
+-- 
+2.52.0
+

0026-test-fixup-NFS-test.sh.patch

@@ -0,0 +1,30 @@
+From 6d84a59ba7a117301e418873a29ba8fc512f1477 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Mon, 18 Aug 2025 16:46:38 +0200
+Subject: [PATCH 26/31] test: fixup NFS test.sh
+
+there is an additional empty line; introduced in 88796914fa725c674196c63109fdc3fdae2f0e9d
+by mistake.
+
+rhel-only
+
+Related: RHEL-97473
+---
+ test/TEST-60-NFS/test.sh | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
+index f6efea36..9d3e8306 100755
+--- a/test/TEST-60-NFS/test.sh
++++ b/test/TEST-60-NFS/test.sh
+@@ -377,7 +377,6 @@ test_setup() {
+     "$DRACUT" -i "$TESTDIR"/overlay / \
+         -a "network ${SERVER_DEBUG:+debug}" \
+         -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod i6300esb virtio_net" \
+-
+         --no-hostonly-cmdline -N \
+         -f "$TESTDIR"/initramfs.server "$KVERSION"
+ }
+-- 
+2.52.0
+

0027-fix-systemd-udevd-handle-root-gpt-auto-for-systemd-v.patch

@@ -0,0 +1,33 @@
+From 77092049801dc20e4f9d046ce6be20503efb3913 Mon Sep 17 00:00:00 2001
+From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
+Date: Mon, 28 Jul 2025 10:10:45 +0200
+Subject: [PATCH 27/31] fix(systemd-udevd): handle root=gpt-auto for
+ systemd-v258
+
+A new file 90-image-dissect.rules was split from 99-systemd.rules to handle
+gpt-root.
+
+Since https://github.com/systemd/systemd/commit/e3f6ae1d09d28dbe31ccf67122486ad037d25ed0
+
+(cherry picked from commit ea5649f5ca23f7a85f9035ef304ae960347624a3)
+
+Resolves: RHEL-113071
+---
+ modules.d/01systemd-udevd/module-setup.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/01systemd-udevd/module-setup.sh b/modules.d/01systemd-udevd/module-setup.sh
+index e8f6e5ba..8b0d5c75 100755
+--- a/modules.d/01systemd-udevd/module-setup.sh
++++ b/modules.d/01systemd-udevd/module-setup.sh
+@@ -34,6 +34,7 @@ depends() {
+ # Install the required file(s) and directories for the module in the initramfs.
+ install() {
+     inst_multiple -o \
++        "$udevrulesdir"/90-image-dissect.rules \
+         "$udevrulesdir"/99-systemd.rules \
+         "$systemdutildir"/systemd-udevd \
+         "$systemdsystemunitdir"/systemd-udevd.service \
+-- 
+2.52.0
+

0028-fix-systemd-repart-allow-partition-format.patch

@@ -0,0 +1,48 @@
+From 92554a7c37a6cd3abc3101e897fa43f1c7f1e4aa Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Fri, 20 Jun 2025 08:38:27 -0400
+Subject: [PATCH 28/31] fix(systemd-repart): allow partition format
+
+systemd-repart is capable not only of creating a partition, but also of
+formatting it. According with repart.d, it is able to create the
+following filesystems: ext4, btrfs, xfs, vfat, erofs and squashfs.
+
+Add support in the systemd-repart module for the underlying tools to
+allow systemd-repart to format the partition.
+
+Failure to do so would make systemd-repart initramfs unit fail, if
+Format= option is provided in a repart.d config file.
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+
+(cherry picked from commit d960ff4ba12a077b49f0cb3f5492b7c467a7738a)
+
+Resolves: RHEL-119787
+---
+ modules.d/01systemd-repart/module-setup.sh | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/modules.d/01systemd-repart/module-setup.sh b/modules.d/01systemd-repart/module-setup.sh
+index f9dafc76..3a750082 100755
+--- a/modules.d/01systemd-repart/module-setup.sh
++++ b/modules.d/01systemd-repart/module-setup.sh
+@@ -19,6 +19,16 @@ install() {
+         "$systemdsystemunitdir"/initrd-root-fs.target.wants/systemd-repart.service \
+         systemd-repart
+ 
++    # Systemd-repart is capable of also formatting the created partition.
++    # Support all filesystems that repart.d supports.
++    inst_multiple -o \
++        "mkfs.ext4" \
++        "mkfs.btrfs" \
++        "mkfs.xfs" \
++        "mkfs.vfat" \
++        "mkfs.erofs" \
++        "mksquashfs"
++
+     # Install the hosts local user configurations if enabled.
+     if [[ $hostonly ]]; then
+         inst_multiple -H -o \
+-- 
+2.52.0
+

0029-feat-install.d-do-not-remove-UKIs-on-remove.patch

@@ -0,0 +1,34 @@
+From f6443b250017653d6a03e3bb718c5af39523e83d Mon Sep 17 00:00:00 2001
+From: Xiong Xiaoqiang <xxiong@redhat.com>
+Date: Thu, 28 Aug 2025 22:02:57 +0800
+Subject: [PATCH 29/31] feat(install.d): do not remove UKIs on remove)
+
+According to the changes of systemd/systemd#37897, when --entry-type=type2 is used (for UKI),
+will not remove normal kernel IMAGE. Resolves: systemd/systemd#37897
+
+Signed-off-by: Xiong Xiaoqiang <xxiong@redhat.com>
+
+Resolves: RHEL-111709
+---
+ install.d/50-dracut.install | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
+index 076b4f5e..61a926dd 100755
+--- a/install.d/50-dracut.install
++++ b/install.d/50-dracut.install
+@@ -120,6 +120,11 @@ case "$COMMAND" in
+         ;;
+ 
+     remove)
++        if [[ "$KERNEL_INSTALL_BOOT_ENTRY_TYPE" == "type2" ]]; then
++            [[ "${KERNEL_INSTALL_VERBOSE:-0}" -gt 0 ]] && \
++                echo "Not removing UKI image (type2); handled by systemd's 90-uki-copy.install"
++            exit 0
++        fi
+         rm -f -- "$BOOT_DIR_ABS/$IMAGE"
+         ret=$?
+         ;;
+-- 
+2.52.0
+

0030-fix-dracut.install-remove-extraneous-quotes-in-dracu.patch

@@ -0,0 +1,32 @@
+From 8ea5a6a2bc5310101c211d70ca104f051b2a3106 Mon Sep 17 00:00:00 2001
+From: Li Tian <litian@redhat.com>
+Date: Thu, 28 Aug 2025 12:24:23 +0800
+Subject: [PATCH 30/31] fix(dracut.install): remove extraneous quotes in dracut
+ arguments
+
+The extraneous quotes become problematic when string is empty.
+dracut is then confused by empty ''.
+
+Signed-off-by: Li Tian <litian@redhat.com>
+
+Resolves: RHEL-111580
+---
+ install.d/50-dracut.install | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
+index 61a926dd..4d790d52 100755
+--- a/install.d/50-dracut.install
++++ b/install.d/50-dracut.install
+@@ -113,7 +113,7 @@ case "$COMMAND" in
+             ${noimageifnotneeded:+--noimageifnotneeded} \
+             $([[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo --verbose) \
+             $([[ -n $KERNEL_IMAGE ]] && echo --kernel-image "$KERNEL_IMAGE") \
+-            "$UEFI_OPTS" \
++            $UEFI_OPTS \
+             --kver "$KERNEL_VERSION" \
+             "$BOOT_DIR_ABS/$IMAGE"
+         ret=$?
+-- 
+2.52.0
+

0031-feat-i18n-pull-drm-or-simpledrm-module-unless-exclud.patch

@@ -0,0 +1,64 @@
+From a788f4c60c7a72185485952d24266581c9de2353 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Tue, 6 Jan 2026 17:59:48 +0100
+Subject: [PATCH 31/31] feat(i18n): pull 'drm' or 'simpledrm' module unless
+ excluded
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some graphic cards require the 'drm' module to be present to be able to
+setup the console font (e.g. 'i915' requires it).
+
+Also avoid conflicts of 'drm' with 'simpledrm' module.
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+Co-authored-by: Renaud Métrich <rmetrich@redhat.com>
+
+(cherry picked from commit d56b581f3ed3e788d8950cce710c6733a08e9d23)
+
+Resolves: RHEL-132571
+---
+ modules.d/10i18n/module-setup.sh | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index 4437f084..d39a5a72 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -9,6 +9,32 @@ check() {
+     return 0
+ }
+ 
++# called by dracut
++depends() {
++    # Include "drm" / "simpledrm" to be able to set the console font properly
++    local _module _drm
++    local -a _modules=(drm simpledrm)
++
++    for _module in "${_modules[@]}"; do
++        if dracut_module_included "$_module"; then
++            _drm="$_module"
++            break
++        fi
++    done
++
++    if [[ -z $_drm ]]; then
++        for _module in "${_modules[@]}"; do
++            module_check "$_module" > /dev/null 2>&1
++            if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $_module\ * ]]; then
++                _drm="$_module"
++                break
++            fi
++        done
++    fi
++
++    echo "$_drm"
++}
++
+ # called by dracut
+ install() {
+     declare -A KEYMAPS
+-- 
+2.52.0
+

0032-feat-resume-add-device-used-for-resume.patch

@@ -0,0 +1,67 @@
+From 9f65e779db692e8ed9f18b76d920fe6b9e414fbc Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Tue, 10 Feb 2026 03:35:26 +0100
+Subject: [PATCH 32/38] feat(resume): add device used for resume
+
+regardless of whether it's mounted.
+
+(cherry picked from commit 9d63c6ad9180fde668cb7d259e8f445d1f5677ea)
+
+Resolves: RHEL-150172
+---
+ modules.d/95resume/module-setup.sh | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
+index 785f681a..1da8b942 100755
+--- a/modules.d/95resume/module-setup.sh
++++ b/modules.d/95resume/module-setup.sh
+@@ -43,26 +43,43 @@ check() {
+ }
+ 
+ # called by dracut
+-cmdline() {
++_get_resume_dev() {
+     local _resume
+ 
+     for dev in "${!host_fs_types[@]}"; do
+         [[ ${host_fs_types[$dev]} =~ ^(swap|swsuspend|swsupend)$ ]] || continue
+         _resume=$(shorten_persistent_dev "$(get_persistent_dev "$dev")")
+-        [[ -n ${_resume} ]] && printf " resume=%s" "${_resume}"
++        [[ -n ${_resume} ]] && echo "${_resume}"
+     done
+ }
+ 
++# called by dracut
++cmdline() {
++    local _resume
++    _resume=$(_get_resume_dev)
++    [[ -n ${_resume} ]] && printf " resume=%s" "${_resume}"
++}
++
+ # called by dracut
+ install() {
+     local _bin
+     local _resumeconf
++    local _dev
+ 
+     if [[ $hostonly_cmdline == "yes" ]]; then
+         _resumeconf=$(cmdline)
+         [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf"
+     fi
+ 
++    # If we have a resume device on cmdline, we want its drivers in initrd regardless whether it's currently mounted.
++    # check current cmdline as well as fstab one
++    _dev=$(_get_resume_dev)
++    [[ $_dev ]] && push_user_devs "$_dev"
++
++    _dev=$(grep -oP "resume=\K([^ ]*)" /proc/cmdline)
++    _dev=$(shorten_persistent_dev "$(get_persistent_dev "$_dev")")
++    [[ $_dev ]] && push_user_devs "$_dev"
++
+     # if systemd is included and has the hibernate-resume tool, use it and nothing else
+     if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
+         inst_multiple -o \
+-- 
+2.54.0
+

0034-fix-iscsi-replace-echo-writes-with-printf-to-prevent.patch

@@ -1,8 +1,8 @@
-From 28a91383a6fadd3120ea58c00106fe5af4708a1d Mon Sep 17 00:00:00 2001
+From bd94bb62b6b4b4e70ea2690ca817aa24a9382d4b Mon Sep 17 00:00:00 2001
 From: Pavel Valena <pvalena@redhat.com>
-Date: Wed, 29 Apr 2026 04:46:15 +0200
+Date: Thu, 7 May 2026 00:45:31 +0200
-Subject: [PATCH] fix(iscsi): replace `echo` writes with `printf` to prevent
+Subject: [PATCH 34/38] fix(iscsi): replace `echo` writes with `printf` to
- variable injection
+ prevent variable injection
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -20,33 +20,26 @@ literally — breaking the connection rather than allowing injection.
 
 (cherry picked from commit e61fe6afe015744baebfd96411015ae360c1af08)
 
-Related: RHEL-170847
+Related: RHEL-170845
 ---
- modules.d/95iscsi/iscsiroot.sh       | 16 ++++++++--------
+ modules.d/95iscsi/iscsiroot.sh       | 10 +++++-----
  modules.d/95iscsi/parse-iscsiroot.sh |  4 ++--
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ 2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
-index 029060e0..4485e3f9 100755
+index d22e958c..1898ef57 100755
 --- a/modules.d/95iscsi/iscsiroot.sh
 +++ b/modules.d/95iscsi/iscsiroot.sh
-@@ -132,12 +132,12 @@ handle_netroot()
+@@ -144,7 +144,7 @@ handle_netroot() {
-     fsopts=${fsopts:+$fsopts,}${iscsirw}
  
      if [ -z "$iscsi_initiator" ] && [ -f /sys/firmware/ibft/initiator/initiator-name ] && ! [ -f /tmp/iscsi_set_initiator ]; then
--           iscsi_initiator=$(while read line || [ -n "$line" ]; do echo $line;done < /sys/firmware/ibft/initiator/initiator-name)
+         iscsi_initiator=$(while read -r line || [ -n "$line" ]; do echo "$line"; done < /sys/firmware/ibft/initiator/initiator-name)
 -        echo "InitiatorName=$iscsi_initiator" > /run/initiatorname.iscsi
-+           iscsi_initiator=$(while read -r line || [ -n "$line" ]; do echo "$line"; done < /sys/firmware/ibft/initiator/initiator-name)
 +        printf 'InitiatorName=%q\n' "$iscsi_initiator" > /run/initiatorname.iscsi
          rm -f /etc/iscsi/initiatorname.iscsi
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
--           > /tmp/iscsi_set_initiator
+@@ -165,7 +165,7 @@ handle_netroot() {
-+           : > /tmp/iscsi_set_initiator
-            if [ -n "$DRACUT_SYSTEMD" ]; then
-                systemctl try-restart iscsid
-                # FIXME: iscsid is not yet ready, when the service is :-/
-@@ -154,7 +154,7 @@ handle_netroot()
  
      if [ -z "$iscsi_initiator" ]; then
          iscsi_initiator=$(iscsi-iname)
@@ -55,7 +48,7 @@ index 029060e0..4485e3f9 100755
          rm -f /etc/iscsi/initiatorname.iscsi
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
-@@ -179,7 +179,7 @@ handle_netroot()
+@@ -189,7 +189,7 @@ handle_netroot() {
          iscsi_lun=0
      fi
  
@@ -64,7 +57,7 @@ index 029060e0..4485e3f9 100755
      ln -fs /run/initiatorname.iscsi /dev/.initiatorname.iscsi
      if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then
          mkdir -p /etc/iscsi
-@@ -200,14 +200,14 @@ handle_netroot()
+@@ -210,14 +210,14 @@ handle_netroot() {
  
      if [ "$root" = "dhcp" ] || [ "$netroot" = "dhcp" ]; then
          # if root is not specified try to mount the whole iSCSI LUN
@@ -75,18 +68,17 @@ index 029060e0..4485e3f9 100755
          wait_for_dev -n /dev/root
  
          # install mount script
--        [ -z "$DRACUT_SYSTEMD" ] && \
+         [ -z "$DRACUT_SYSTEMD" ] \
--            echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
+-            && echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > "$hookdir"/mount/01-$$-iscsi.sh
-+        [ -z "$DRACUT_SYSTEMD" ] \
 +            && printf 'iscsi_lun=%q . /bin/mount-lun.sh\n' "$iscsi_lun" > "$hookdir"/mount/01-$$-iscsi.sh
      fi
  
-     targets=$(iscsiadm -m discovery -t st -p $iscsi_target_ip:${iscsi_target_port:+$iscsi_target_port} | sed 's/^.*iqn/iqn/')
+     if strglobin "$iscsi_target_ip" '*:*:*' && ! strglobin "$iscsi_target_ip" '['; then
 diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
-index 8d6e3e8c..1a26041d 100755
+index a388bec1..d932d4f7 100755
 --- a/modules.d/95iscsi/parse-iscsiroot.sh
 +++ b/modules.d/95iscsi/parse-iscsiroot.sh
-@@ -105,7 +105,7 @@ fi
+@@ -111,7 +111,7 @@ fi
  
  if arg=$(getarg rd.iscsi.initiator -d iscsi_initiator=) && [ -n "$arg" ] && ! [ -f /run/initiatorname.iscsi ]; then
      iscsi_initiator=$arg
@@ -95,13 +87,15 @@ index 8d6e3e8c..1a26041d 100755
      ln -fs /run/initiatorname.iscsi /dev/.initiatorname.iscsi
      rm -f /etc/iscsi/initiatorname.iscsi
      mkdir -p /etc/iscsi
-@@ -121,7 +121,7 @@ fi
+@@ -127,7 +127,7 @@ fi
- if [ -z $iscsi_initiator ] && [ -f /sys/firmware/ibft/initiator/initiator-name ] && ! [ -f /tmp/iscsi_set_initiator ]; then
+ if [ -z "$iscsi_initiator" ] && [ -f /sys/firmware/ibft/initiator/initiator-name ] && ! [ -f /tmp/iscsi_set_initiator ]; then
-     iscsi_initiator=$(while read line || [ -n "$line" ]; do echo $line;done < /sys/firmware/ibft/initiator/initiator-name)
+     iscsi_initiator=$(while read -r line || [ -n "$line" ]; do echo "$line"; done < /sys/firmware/ibft/initiator/initiator-name)
      if [ -n "$iscsi_initiator" ]; then
 -        echo "InitiatorName=$iscsi_initiator" > /run/initiatorname.iscsi
 +        printf 'InitiatorName=%q\n' "$iscsi_initiator" > /run/initiatorname.iscsi
          rm -f /etc/iscsi/initiatorname.iscsi
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
+-- 
+2.54.0
 

0035-fix-base-escape-arguments-in-initqueue-hook-script-g.patch

@@ -1,7 +1,7 @@
-From eaf700abda3eb7a1f7eecd6b8f374adc4bfe6349 Mon Sep 17 00:00:00 2001
+From f35d9ee1e2bc643db1448747c23c6c90c28b50f3 Mon Sep 17 00:00:00 2001
 From: Pavel Valena <pvalena@redhat.com>
-Date: Tue, 12 May 2026 03:27:22 +0200
+Date: Thu, 14 May 2026 14:20:17 +0200
-Subject: [PATCH] fix(base): escape arguments in initqueue hook script
+Subject: [PATCH 35/38] fix(base): escape arguments in initqueue hook script
  generation
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -26,42 +26,40 @@ characters to leak into iscsiroot arguments.
 
 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 
-Related: RHEL-170847
+Related: RHEL-170845
 ---
- modules.d/95iscsi/parse-iscsiroot.sh | 6 +++---
+ modules.d/95iscsi/parse-iscsiroot.sh | 4 ++--
  modules.d/99base/initqueue.sh        | 3 ++-
- 2 files changed, 5 insertions(+), 4 deletions(-)
+ 2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
-index 1a26041d..241f1bdd 100755
+index d932d4f7..bfc2270d 100755
 --- a/modules.d/95iscsi/parse-iscsiroot.sh
 +++ b/modules.d/95iscsi/parse-iscsiroot.sh
-@@ -87,7 +87,7 @@ if [ -n "$iscsi_firmware" ]; then
+@@ -89,7 +89,7 @@ if [ -n "$iscsi_firmware" ]; then
-     echo "${DRACUT_SYSTEMD+systemctl is-active initrd-root-device.target || }[ -f '/tmp/iscsistarted-firmware' ]" > $hookdir/initqueue/finished/iscsi_started.sh
+     echo "${DRACUT_SYSTEMD+systemctl is-active initrd-root-device.target || }[ -f '/tmp/iscsistarted-firmware' ]" > "$hookdir"/initqueue/finished/iscsi_started.sh
-     initqueue --unique --online /sbin/iscsiroot online "iscsi:" "$NEWROOT"
+     /sbin/initqueue --unique --online /sbin/iscsiroot online "iscsi:" "$NEWROOT"
-     initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "iscsi:" "$NEWROOT"
+     /sbin/initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "iscsi:" "$NEWROOT"
--    initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
+-    /sbin/initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
-+    initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "$NEWROOT"
++    /sbin/initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "$NEWROOT"
  fi
  
  # ISCSI actually supported?
-@@ -98,8 +98,8 @@ fi
+@@ -105,7 +105,7 @@ modprobe -b -q be2iscsi
- modprobe --all -b -q qla4xxx cxgb3i cxgb4i bnx2i be2iscsi
  
  if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ]; then
--    if ! getargbool 1 rd.neednet >/dev/null || ! getarg "ip="; then
+     if ! getargbool 1 rd.neednet > /dev/null || ! getarg "ip="; then
--        initqueue --unique --onetime --settled /sbin/iscsiroot dummy "'$netroot'" "'$NEWROOT'"
+-        /sbin/initqueue --unique --onetime --settled /sbin/iscsiroot dummy "'$netroot'" "'$NEWROOT'"
-+    if ! getargbool 1 rd.neednet > /dev/null || ! getarg "ip="; then
++        /sbin/initqueue --unique --onetime --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
-+        initqueue --unique --onetime --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
      fi
  fi
  
 diff --git a/modules.d/99base/initqueue.sh b/modules.d/99base/initqueue.sh
-index c3016383..184414ab 100755
+index 46a00d2a..1caa5273 100755
 --- a/modules.d/99base/initqueue.sh
 +++ b/modules.d/99base/initqueue.sh
-@@ -52,7 +52,8 @@ fi
+@@ -64,7 +64,8 @@ fi
- {
+     # shellcheck disable=SC2016
      [ -n "$onetime" ] && echo '[ -e "$job" ] && rm -f -- "$job"'
      [ -n "$env" ] && echo "$env"
 -    echo "$exe" "$@"
@@ -70,3 +68,6 @@ index c3016383..184414ab 100755
  } > "/tmp/$$-${job}.sh"
  
  mv -f "/tmp/$$-${job}.sh" "$hookdir/initqueue${qname}/${job}.sh"
+-- 
+2.54.0
+

0036-fix-net-lib-warn-on-suspicious-shell-metacharacters-.patch

@@ -0,0 +1,48 @@
+From ef6c6bcd0665a050ea4daeba6b182c889e55b626 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Thu, 14 May 2026 14:25:07 +0200
+Subject: [PATCH 36/38] fix(net-lib): warn on suspicious shell metacharacters
+ in hostname file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+setup_net() sources /tmp/net.$netif.hostname as shell, which is written
+by dhclient-script.sh or ifup.sh. Add a defensive check that warns if
+the file contains shell metacharacters ($, `, ;, &, |, () that should
+never appear in a legitimate hostname, indicating possible DHCP-based
+command injection attempts.
+
+The file is still sourced for compatibility — the writer-side fix
+(printf '%q') already prevents execution of injected content.
+
+Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
+
+Related: RHEL-170845
+---
+ modules.d/45net-lib/net-lib.sh | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/45net-lib/net-lib.sh b/modules.d/45net-lib/net-lib.sh
+index dc6be881..60200e64 100755
+--- a/modules.d/45net-lib/net-lib.sh
++++ b/modules.d/45net-lib/net-lib.sh
+@@ -131,8 +131,13 @@ setup_net() {
+     [ -e "/tmp/net.ifaces" ] && read -r IFACES < /tmp/net.ifaces
+     [ -z "$IFACES" ] && IFACES="$netif"
+     # run the scripts written by ifup
+-    # shellcheck disable=SC1090
+-    [ -e /tmp/net."$netif".hostname ] && . /tmp/net."$netif".hostname
++    if [ -e /tmp/net."$netif".hostname ]; then
++        if grep -qE '[$`;&|(]' /tmp/net."$netif".hostname 2> /dev/null; then
++            warn "setup_net $netif: /tmp/net.$netif.hostname contains suspicious shell metacharacters"
++        fi
++        # shellcheck disable=SC1090
++        . /tmp/net."$netif".hostname
++    fi
+     # shellcheck disable=SC1090
+     [ -e /tmp/net."$netif".override ] && . /tmp/net."$netif".override
+     # shellcheck disable=SC1090
+-- 
+2.54.0
+

0037-fix-systemd-networkd-escape-DHCP-lease-values-in-dhc.patch

@@ -0,0 +1,48 @@
+From 9a0f09bbee567513060ec590603e369d88b93422 Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Thu, 14 May 2026 16:08:00 +0200
+Subject: [PATCH 37/38] fix(systemd-networkd): escape DHCP lease values in
+ dhcpopts generation
+
+networkd-run.sh converts DHCP lease values (ROOT_PATH, NEXT_SERVER)
+into shell variable assignments written to /tmp/dhclient.<ifname>.dhcpopts,
+which is later sourced by netroot.sh, net-lib.sh, and nfs-lib.sh. The
+previous sed-based pipeline wrapped values in single quotes without
+escaping embedded single quotes, allowing a rogue DHCP server to inject
+arbitrary shell commands via a crafted ROOT_PATH or NEXT_SERVER value.
+
+Replace the grep|sed pipeline with a while-read loop that uses
+printf '%q' to shell-escape values before writing, consistent with how
+the NetworkManager equivalent (nm-run.sh) already handles this.
+
+Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
+
+Related: RHEL-170845
+---
+ modules.d/01systemd-networkd/networkd-run.sh | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/01systemd-networkd/networkd-run.sh b/modules.d/01systemd-networkd/networkd-run.sh
+index a3ea0f6c..e2a33518 100755
+--- a/modules.d/01systemd-networkd/networkd-run.sh
++++ b/modules.d/01systemd-networkd/networkd-run.sh
+@@ -12,10 +12,12 @@ for ifpath in /sys/class/net/*; do
+         leases_file="/run/systemd/netif/leases/$(cat "$ifpath"/ifindex)"
+         dhcpopts_file="/tmp/dhclient.${ifname}.dhcpopts"
+         if [ -r "$leases_file" ]; then
+-            grep -E "^(NEXT_SERVER|ROOT_PATH)=" "$leases_file" \
+-                | sed -e "s/NEXT_SERVER=/new_next_server='/" \
+-                    -e "s/ROOT_PATH=/new_root_path='/" \
+-                    -e "s/$/'/" > "$dhcpopts_file" || true
++            while IFS='=' read -r key val; do
++                case "$key" in
++                    NEXT_SERVER) printf 'new_next_server=%q\n' "$val" ;;
++                    ROOT_PATH) printf 'new_root_path=%q\n' "$val" ;;
++                esac
++            done < "$leases_file" > "$dhcpopts_file"
+         fi
+ 
+         source_hook initqueue/online "$ifname"
+-- 
+2.54.0
+

0038-fix-i18n-prefer-simpledrm-over-drm-module.patch

@@ -0,0 +1,66 @@
+From 3ce081cd5b487c2c2147e61f437ad4b10cc8860b Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Thu, 25 Jun 2026 05:48:30 +0200
+Subject: [PATCH 38/38] fix(i18n): prefer 'simpledrm' over 'drm' module
+
++ feat(plymouth): use the same logic to select prefered module
+
+Resolves: RHEL-188254
+---
+ modules.d/10i18n/module-setup.sh     |  4 ++--
+ modules.d/45plymouth/module-setup.sh | 23 ++++++++++++++++++++++-
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index d39a5a72..1386a8fc 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -11,9 +11,9 @@ check() {
+ 
+ # called by dracut
+ depends() {
+-    # Include "drm" / "simpledrm" to be able to set the console font properly
++    # Include "simpledrm" / "drm" to be able to set the console font properly
+     local _module _drm
+-    local -a _modules=(drm simpledrm)
++    local -a _modules=(simpledrm drm)
+ 
+     for _module in "${_modules[@]}"; do
+         if dracut_module_included "$_module"; then
+diff --git a/modules.d/45plymouth/module-setup.sh b/modules.d/45plymouth/module-setup.sh
+index f17b60d0..31084652 100755
+--- a/modules.d/45plymouth/module-setup.sh
++++ b/modules.d/45plymouth/module-setup.sh
+@@ -24,7 +24,28 @@ check() {
+ 
+ # called by dracut
+ depends() {
+-    echo drm bash
++    # Include "simpledrm" / "drm" to be able to set the console font properly
++    local _module _drm
++    local -a _modules=(simpledrm drm)
++
++    for _module in "${_modules[@]}"; do
++        if dracut_module_included "$_module"; then
++            _drm="$_module"
++            break
++        fi
++    done
++
++    if [[ -z $_drm ]]; then
++        for _module in "${_modules[@]}"; do
++            module_check "$_module" > /dev/null 2>&1
++            if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $_module\ * ]]; then
++                _drm="$_module"
++                break
++            fi
++        done
++    fi
++
++    echo bash "$_drm"
+ }
+ 
+ # called by dracut
+-- 
+2.54.0
+

0039-fix-qemu-add-missing-bochs-module-explicitly.patch

@@ -0,0 +1,27 @@
+From 6328318f17933798a4a1a4e3b974b27070a470ad Mon Sep 17 00:00:00 2001
+From: Pavel Valena <pvalena@redhat.com>
+Date: Wed, 12 Aug 2026 22:55:18 +0200
+Subject: [PATCH 39/41] fix(qemu): add missing bochs module explicitly
+
+As it is needed to display console properly, and doesn't get detected in some cases.
+
+Resolves: RHEL-172462
+---
+ modules.d/90qemu/module-setup.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh
+index fecaca61..27c4c143 100755
+--- a/modules.d/90qemu/module-setup.sh
++++ b/modules.d/90qemu/module-setup.sh
+@@ -21,4 +21,7 @@ installkernel() {
+         spapr-vscsi \
+         qemu_fw_cfg \
+         efi_secret
++
++    # needed for displaying console properly
++    hostonly='' instmods bochs
+ }
+-- 
+2.55.0
+

0040-fix-base-escape-die-message-in-emergency-hook-script.patch

@@ -1,7 +1,8 @@
-From d3d55e027b7628c7738d091fe301d8cb639cab24 Mon Sep 17 00:00:00 2001
+From daed5d8f3691580a6b9b72e54d7bfc5fb6ded4df Mon Sep 17 00:00:00 2001
 From: Pavel Valena <pvalena@redhat.com>
-Date: Tue, 28 Jul 2026 05:10:09 +0200
+Date: Tue, 28 Jul 2026 04:03:13 +0200
-Subject: [PATCH] fix(base): escape die() message in emergency hook script
+Subject: [PATCH 40/41] fix(base): escape die() message in emergency hook
+ script
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -20,24 +21,27 @@ DHCP-controlled values that reach die() through error paths.
 
 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 
-Resolves: RHEL-210935
+(cherry picked from commit 508599e7864c8902bbc5480a0f4d20804d9dd41a)
+
+Resolves: RHEL-210943
 ---
- modules.d/99base/dracut-lib.sh | 4 ++--
+ modules.d/99base/dracut-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 89a1d69ad..832435d21 100755
+index 05c361c6..855305b3 100755
 --- a/modules.d/99base/dracut-lib.sh
 +++ b/modules.d/99base/dracut-lib.sh
-@@ -462,8 +462,8 @@ die() {
+@@ -410,7 +410,8 @@ die() {
      } > /dev/kmsg
  
      {
--        echo "warn dracut: FATAL: \"$*\"";
+-        echo "warn dracut: FATAL: \"$*\""
--        echo "warn dracut: Refusing to continue";
 +        printf 'warn dracut: FATAL: %q\n' "$*"
-+        echo "warn dracut: Refusing to continue"
++
+         echo "warn dracut: Refusing to continue"
      } >> $hookdir/emergency/01-die.sh
      [ -d /run/initramfs ] || mkdir -p -- /run/initramfs
- 
+-- 
+2.55.0
 

0041-fix-base-replace-eval-with-safe-variable-indirection.patch

@@ -1,34 +1,36 @@
-From b8f636d1cdcd2de0211cc5a7ad5424deee2a3568 Mon Sep 17 00:00:00 2001
+From 2a395c7d4abe8e26836ecf109ab69600d4243e03 Mon Sep 17 00:00:00 2001
 From: Pavel Valena <pvalena@redhat.com>
-Date: Wed, 29 Apr 2026 05:41:21 +0200
+Date: Thu, 7 May 2026 00:59:05 +0200
-Subject: [PATCH] fix(base): replace eval with safe variable indirection in
+Subject: [PATCH 41/41] fix(base): replace eval with safe variable indirection
- splitsep and export_n
+ in splitsep and export_n
 
 splitsep: use local nameref to avoid eval injection via single-quote breakout.
 export_n: use ${!var} and printf -v to avoid eval injection via double-quote breakout.
 
-Related: RHEL-210935
+(cherry picked from commit 1488eb683109cc5b2e5e038e1e89851ab0cd9508)
+
+Related: RHEL-210943
 ---
- modules.d/99base/dracut-lib.sh | 20 ++++++++++++--------
+ modules.d/99base/dracut-lib.sh | 15 ++++++++++-----
- 1 file changed, 12 insertions(+), 8 deletions(-)
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 832435d21..0a0604472 100755
+index 855305b3..48dfd590 100755
 --- a/modules.d/99base/dracut-lib.sh
 +++ b/modules.d/99base/dracut-lib.sh
-@@ -395,12 +395,18 @@ splitsep() {
+@@ -329,12 +329,18 @@ splitsep() {
  
-     while [ -n "$str" -a "$#" -gt 1 ]; do
+     while [ -n "$str" ] && [ "$#" -gt 1 ]; do
-         tmp="${str%%$sep*}"
+         tmp="${str%%"$sep"*}"
 -        eval "$1='${tmp}'"
 +        local -n _splitsep_ref="$1"
 +        _splitsep_ref="$tmp"
 +        unset -n _splitsep_ref
          str="${str#"$tmp"}"
-         str="${str#$sep}"
+         str="${str#"$sep"}"
          shift
      done
--    [ -n "$str" -a -n "$1" ] && eval "$1='$str'"
+-    [ -n "$str" ] && [ -n "$1" ] && eval "$1='$str'"
 +    if [ -n "$str" -a -n "$1" ]; then
 +        local -n _splitsep_ref="$1"
 +        _splitsep_ref="$str"
@@ -37,23 +39,23 @@ index 832435d21..0a0604472 100755
      debug_on
      return 0
  }
-@@ -1168,15 +1174,13 @@ emergency_shell()
+@@ -923,14 +929,13 @@ emergency_shell() {
  }
  
  # Retain the values of these variables but ensure that they are unexported
 -# This is a POSIX-compliant equivalent of bash's "export -n"
--export_n()
+ export_n() {
--{
-+export_n() {
      local var
      local val
      for var in "$@"; do
--        eval val=\$$var
+-        eval "val=\$$var"
--        unset $var
--        [ -n "$val" ] && eval $var=\"$val\"
 +        val="${!var}"
-+        unset "$var"
+         unset "$var"
+-        [ -n "$val" ] && eval "$var=\"$val\""
 +        [ -n "$val" ] && printf -v "$var" '%s' "$val"
      done
  }
  
+-- 
+2.55.0
+

SOURCES/0001.patch

@@ -1,53 +0,0 @@
-From 3cb0f01a1e8a05dd4c6412907f5e9a398b2ace2c Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Fri, 31 Aug 2018 13:06:34 +0200
-Subject: [PATCH] Revert "use cp --reflink=auto"
-
-This reverts commit 8cd8820547257299a33b2d1e3ecf7c6241a569b2.
-Resolves: #1623990
----
- 50-dracut.install            | 2 +-
- 51-dracut-rescue-postinst.sh | 2 +-
- 51-dracut-rescue.install     | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/50-dracut.install b/50-dracut.install
-index 64e3549f..ec59dcb3 100755
---- a/50-dracut.install
-+++ b/50-dracut.install
-@@ -25,7 +25,7 @@ case "$COMMAND" in
-         if [[ -f ${INITRD_IMAGE_PREGENERATED} ]]; then
-             # we found an initrd at the same place as the kernel
-             # use this and don't generate a new one
--            cp --reflink=auto "$INITRD_IMAGE_PREGENERATED" "$BOOT_DIR_ABS/$INITRD" \
-+            cp "$INITRD_IMAGE_PREGENERATED" "$BOOT_DIR_ABS/$INITRD" \
-                 && chown root:root "$BOOT_DIR_ABS/$INITRD" \
-                 && chmod 0600 "$BOOT_DIR_ABS/$INITRD" \
-                 && exit 0
-diff --git a/51-dracut-rescue-postinst.sh b/51-dracut-rescue-postinst.sh
-index 67f5b717..23158552 100755
---- a/51-dracut-rescue-postinst.sh
-+++ b/51-dracut-rescue-postinst.sh
-@@ -57,7 +57,7 @@ if [[ ! -f $INITRDFILE ]]; then
- fi
- 
- if [[ ! -f $NEW_KERNEL_IMAGE ]]; then
--    cp --reflink=auto "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE"
-+    cp "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE"
-     ((ret+=$?))
- fi
- 
-diff --git a/51-dracut-rescue.install b/51-dracut-rescue.install
-index 6ddafdb6..426ddee5 100755
---- a/51-dracut-rescue.install
-+++ b/51-dracut-rescue.install
-@@ -93,7 +93,7 @@ case "$COMMAND" in
- 
-         [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS"
- 
--        if ! cp --reflink=auto "$KERNEL_IMAGE" "$BOOT_DIR_ABS/$KERNEL"; then
-+        if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS/$KERNEL"; then
-             echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/$KERNEL'!" >&2
-         fi
- 
-

SOURCES/0002.patch

@@ -1,28 +0,0 @@
-From 2e5265c80e03112c75888a31c170963e913070ed Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Tue, 14 Aug 2018 14:04:02 +0200
-Subject: [PATCH] spec: return old provides
-
----
- dracut.spec | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/dracut.spec b/dracut.spec
-index 155868ce..553280c3 100644
---- a/dracut.spec
-+++ b/dracut.spec
-@@ -65,6 +65,13 @@ Provides:  dracut-fips = %{version}-%{release}
- Obsoletes: dracut-fips-aesni <= 047
- Provides:  dracut-fips-aesni = %{version}-%{release}
- 
-+Obsoletes: dracut-kernel < 005
-+Provides:  dracut-kernel = %{version}-%{release}
-+
-+Obsoletes: dracut < 030
-+Obsoletes: dracut-norescue < 030
-+Provides:  dracut-norescue = %{version}-%{release}
-+
- Requires: bash >= 4
- Requires: coreutils
- Requires: cpio
-

SOURCES/0003.patch

@@ -1,44 +0,0 @@
-From 44c9d019d88df05f69f2112aeae34bdbff61cee6 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Sat, 29 Sep 2018 17:14:31 +0800
-Subject: [PATCH] dracut.spec: Fix error introduced by 70291ed
-
-70291e0 ('dracut.spec: Add dracut-squash package') introduced a new
-dracut-squash package, but by accident it overrided some other package
-spec and the dependency name is wrong. This patch will fix it.
----
- dracut.spec | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/dracut.spec b/dracut.spec
-index 553280c3..de57703c 100644
---- a/dracut.spec
-+++ b/dracut.spec
-@@ -188,7 +188,7 @@ This package contains tools to assemble the local initrd and host configuration.
- %package squash
- Summary: dracut module to build an initramfs with most files in a squashfs image
- Requires: %{name} = %{version}-%{release}
--Requires: squash-tools
-+Requires: squashfs-tools
- 
- %description squash
- This package provides a dracut module to build an initramfs, but store most files
-@@ -459,14 +459,14 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
- %doc %{_mandir}/man8/dracut-catimages.8*
- %endif
- 
--%files squash
--%{dracutlibdir}/modules.d/99squash
--
- %{_bindir}/dracut-catimages
- %dir /boot/dracut
- %dir /var/lib/dracut
- %dir /var/lib/dracut/overlay
- 
-+%files squash
-+%{dracutlibdir}/modules.d/99squash
-+
- %files config-generic
- %{dracutlibdir}/dracut.conf.d/02-generic-image.conf
- 
-

SOURCES/0004.patch

@@ -1,34 +0,0 @@
-From 3b9b20d237b3ec939b1bf9dd065c875fee54fe63 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Fri, 12 Oct 2018 13:07:13 +0800
-Subject: [PATCH] 40network: Don't include 40network by default
-
-commit 7347391 ('network-legacy: split off from network module')
-splitted network function to network-legacy and removed check() function
-of 40network. This caused 40network to be included even if network is
-not needed.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
-
-Cherry-picked from: 83cbc06ab91288e2d931b4f36935bfdb79a99b0e
-Resolves: #1639088
----
- modules.d/40network/module-setup.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 57c0a45e..e8541636 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -1,5 +1,10 @@
- #!/bin/bash
- 
-+# called by dracut
-+check() {
-+    return 255
-+}
-+
- # called by dracut
- depends() {
-     echo -n "kernel-network-modules "
-

SOURCES/0005.patch

@@ -1,34 +0,0 @@
-From b63e0c5040d9881f8c3c0bc09fc21c6588c8a26f Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Thu, 18 Oct 2018 17:05:22 +0800
-Subject: [PATCH] 99squash: Don't clean up squahfs on isolate
-
-The only time we need to cleanup squahfs manually is on switch root, to
-release resource and memory. We've covered that by setting
-"Conflicts=initrd-switch-root.target" for squash cleanup service.
-On shutdown systemd will take care of squahfs mounts. But for other
-isolate, files in initramfs are most likely still required, so don't
-clean up squahfs. For example, kdump's emergency handler will isolate
-into its own target, if squahfs is cleaned up it will fail.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
-
-Cherry-picked from: b9af0fcd
-Resolves: #1641423
----
- modules.d/99squash/squash-mnt-clear.service | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/99squash/squash-mnt-clear.service b/modules.d/99squash/squash-mnt-clear.service
-index 8dd17812..f8d5db46 100644
---- a/modules.d/99squash/squash-mnt-clear.service
-+++ b/modules.d/99squash/squash-mnt-clear.service
-@@ -9,6 +9,7 @@ After=dracut-initqueue.service dracut-pre-pivot.service
- Before=initrd-cleanup.service
- ConditionPathExists=/squash/root
- Conflicts=initrd-switch-root.target
-+IgnoreOnIsolate=true
- 
- [Service]
- Type=oneshot
-

SOURCES/0006.patch

@@ -1,46 +0,0 @@
-From 5541b0c46f02f678c698aa523db7a86dde82a947 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Thu, 25 Oct 2018 15:30:36 +0200
-Subject: [PATCH] dracut.install: call dracut with --force
-
-The kernel-install is called even if you run make install.
-Since we don't call dracut with -f a second make install will fail
-because initrd with same version is already there.
-This makes kernel developers feel miserable.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1642402
-
-Cherry-picked from: 48c283a2
-Resolves: #1642402
----
- 50-dracut.install        | 2 +-
- 51-dracut-rescue.install | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/50-dracut.install b/50-dracut.install
-index ec59dcb3..139ff82e 100755
---- a/50-dracut.install
-+++ b/50-dracut.install
-@@ -49,7 +49,7 @@ case "$COMMAND" in
-                 break
-             fi
-         done
--	dracut ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
-+	dracut -f ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
-         ret=$?
- 	;;
-     remove)
-diff --git a/51-dracut-rescue.install b/51-dracut-rescue.install
-index 426ddee5..0580062f 100755
---- a/51-dracut-rescue.install
-+++ b/51-dracut-rescue.install
-@@ -98,7 +98,7 @@ case "$COMMAND" in
-         fi
- 
-         if [[ ! -f "$BOOT_DIR_ABS/$INITRD" ]]; then
--            dracut --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
-+            dracut -f --no-hostonly -a "rescue" "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
-             ((ret+=$?))
-         fi
- 
-

SOURCES/0007.patch

@@ -1,41 +0,0 @@
-From d8386b5d8fae2e45a27635c48ecab63abba10e39 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 24 Oct 2018 15:14:03 +0200
-Subject: [PATCH] Makefile: add srpm target
-
----
- Makefile | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 80623437..503d069f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -40,7 +40,7 @@ man8pages = dracut.8 \
- 
- manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
- 
--.PHONY: install clean archive rpm testimage test all check AUTHORS doc dracut-version.sh
-+.PHONY: install clean archive rpm srpm testimage test all check AUTHORS doc dracut-version.sh
- 
- all: dracut-version.sh dracut.pc dracut-install skipcpio/skipcpio
- 
-@@ -216,6 +216,17 @@ rpm: dracut-$(VERSION).tar.xz syncheck
- 		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
- 	( mv "$$rpmbuild"/{,$$(arch)/}*.rpm $(DESTDIR).; rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
- 
-+srpm: dracut-$(VERSION).tar.xz syncheck
-+	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
-+	cp dracut-$(VERSION).tar.xz "$$rpmbuild"; \
-+	LC_MESSAGES=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
-+	(cd "$$rpmbuild"; \
-+	[ -f $$src/lgpl-2.1.txt ] && cp $$src/lgpl-2.1.txt . || wget https://www.gnu.org/licenses/lgpl-2.1.txt; \
-+	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
-+	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
-+		--define "_rpmdir $$PWD" -bs dracut.spec; ) && \
-+	( mv "$$rpmbuild"/*.src.rpm $(DESTDIR).; rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
-+
- syncheck:
- 	@ret=0;for i in dracut-initramfs-restore.sh modules.d/*/*.sh; do \
-                 [ "$${i##*/}" = "module-setup.sh" ] && continue; \
-

SOURCES/0008.patch

@@ -1,38 +0,0 @@
-From 90054e4f1f2f64cb9a2b06b44b5a82b293c387dd Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Thu, 10 Jan 2019 18:08:32 +0100
-Subject: [PATCH] 95iscsi: decouple iscsi from sysinit.target
-
----
- modules.d/95iscsi/module-setup.sh | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
-index 5c2073bb..ae1924cc 100755
---- a/modules.d/95iscsi/module-setup.sh
-+++ b/modules.d/95iscsi/module-setup.sh
-@@ -265,6 +265,23 @@ install() {
-             echo "After=dracut-cmdline.service"
-             echo "Before=dracut-initqueue.service"
-         ) > "${initdir}/$systemdsystemunitdir/iscsid.service.d/dracut.conf"
-+
-+        # The iscsi deamon does not need to wait for any storage inside initrd
-+        mkdir -p "${initdir}/$systemdsystemunitdir/iscsid.socket.d"
-+        (
-+            echo "[Unit]"
-+            echo "DefaultDependencies=no"
-+            echo "Conflicts=shutdown.target"
-+            echo "Before=shutdown.target sockets.target"
-+        ) > "${initdir}/$systemdsystemunitdir/iscsid.socket.d/dracut.conf"
-+        mkdir -p "${initdir}/$systemdsystemunitdir/iscsuio.socket.d"
-+        (
-+            echo "[Unit]"
-+            echo "DefaultDependencies=no"
-+            echo "Conflicts=shutdown.target"
-+            echo "Before=shutdown.target sockets.target"
-+        ) > "${initdir}/$systemdsystemunitdir/iscsuio.socket.d/dracut.conf"
-+
-     fi
-     inst_dir /var/lib/iscsi
-     dracut_need_initqueue
-

SOURCES/0009.patch

@@ -1,30 +0,0 @@
-From e44c26f0fc6b29fb42cbc6d5ab57e34b07aa2ce1 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Tue, 15 Jan 2019 16:42:38 +0100
-Subject: [PATCH] 95iscsi: fix a typo in a name of iscsiuio
-
----
- modules.d/95iscsi/module-setup.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
-index ae1924cc..79af4a47 100755
---- a/modules.d/95iscsi/module-setup.sh
-+++ b/modules.d/95iscsi/module-setup.sh
-@@ -274,13 +274,13 @@ install() {
-             echo "Conflicts=shutdown.target"
-             echo "Before=shutdown.target sockets.target"
-         ) > "${initdir}/$systemdsystemunitdir/iscsid.socket.d/dracut.conf"
--        mkdir -p "${initdir}/$systemdsystemunitdir/iscsuio.socket.d"
-+        mkdir -p "${initdir}/$systemdsystemunitdir/iscsiuio.socket.d"
-         (
-             echo "[Unit]"
-             echo "DefaultDependencies=no"
-             echo "Conflicts=shutdown.target"
-             echo "Before=shutdown.target sockets.target"
--        ) > "${initdir}/$systemdsystemunitdir/iscsuio.socket.d/dracut.conf"
-+        ) > "${initdir}/$systemdsystemunitdir/iscsiuio.socket.d/dracut.conf"
- 
-     fi
-     inst_dir /var/lib/iscsi
-

SOURCES/0010.patch

@@ -1,26 +0,0 @@
-From c787ad30ab5467c9f3c740a1cd7ed8b3198b9719 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Tue, 21 May 2019 17:58:38 +0200
-Subject: [PATCH] net-lib: strstr is not for globs
-
-(cherry picked from commit 1a3dcc8b46c967445794e679280a3fb3b8e77ae0)
-
-Resolves: #1712469
----
- modules.d/40network/net-lib.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
-index 1e7f1b33..7b93f25e 100755
---- a/modules.d/40network/net-lib.sh
-+++ b/modules.d/40network/net-lib.sh
-@@ -463,7 +463,7 @@ ip_to_var() {
-         #         ip=<ipv4-address> means anaconda-style static config argument cluster
-         autoconf="$1"
- 
--        if strstr "$autoconf" "*.*.*.*"; then
-+        if strglob "$autoconf" "*.*.*.*"; then
-             # ip=<ipv4-address> means anaconda-style static config argument cluster:
-             # ip=<ip> gateway=<gw> netmask=<nm> hostname=<host> mtu=<mtu>
-             # ksdevice={link|bootif|ibft|<MAC>|<ifname>}
-

SOURCES/0011.patch

@@ -1,40 +0,0 @@
-From 81b59fbbd6ebeee05b5d6869ae4f36bb9e486f72 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Tue, 8 Jan 2019 17:16:07 +0100
-Subject: [PATCH] 95iscsi: rd.iscsi.initiator should have priority over stored
- configuration
-
-(cherry picked from commit 61afc704548cecc7f7d2fa3b5f1319e790cc5bee)
-
-Resolves: #1664062
----
- modules.d/95iscsi/parse-iscsiroot.sh | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
-index 7a64d888..f00a83bb 100755
---- a/modules.d/95iscsi/parse-iscsiroot.sh
-+++ b/modules.d/95iscsi/parse-iscsiroot.sh
-@@ -107,14 +107,13 @@ if arg=$(getarg rd.iscsi.initiator -d iscsi_initiator=) && [ -n "$arg" ] && ! [
-     iscsi_initiator=$arg
-     echo "InitiatorName=$iscsi_initiator" > /run/initiatorname.iscsi
-     ln -fs /run/initiatorname.iscsi /dev/.initiatorname.iscsi
--    if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then
--        mkdir -p /etc/iscsi
--        ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
--        if [ -n "$DRACUT_SYSTEMD" ]; then
--            systemctl try-restart iscsid
--            # FIXME: iscsid is not yet ready, when the service is :-/
--            sleep 1
--        fi
-+    rm -f /etc/iscsi/initiatorname.iscsi
-+    mkdir -p /etc/iscsi
-+    ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
-+    if [ -n "$DRACUT_SYSTEMD" ]; then
-+        systemctl try-restart iscsid
-+        # FIXME: iscsid is not yet ready, when the service is :-/
-+        sleep 1
-     fi
- fi
- 
-

SOURCES/0012.patch

@@ -1,86 +0,0 @@
-From 9c54932f590fd7accadc780c6ee946a94286b7e6 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Tue, 14 May 2019 09:23:55 +0200
-Subject: [PATCH] fips: split loading the crypto modules and checking the
- kernel
-
-In e54ab383 we moved the fips script to a later pahse of boot, since
-the /boot might not be available early on.
-
-The problem is that systemd-cryptsetup* services could be run now
-started before the do_fips is executed and need the crypto modules
-to decrypted the devices.
-
-So let's split the do_fips and load the module before udev does the
-trigger.
----
- modules.d/01fips/fips-load-crypto.sh |  8 ++++++++
- modules.d/01fips/fips.sh             | 19 +++++++++++--------
- modules.d/01fips/module-setup.sh     |  1 +
- 3 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/modules.d/01fips/fips-load-crypto.sh b/modules.d/01fips/fips-load-crypto.sh
-new file mode 100644
-index 00000000..82cbeee4
---- /dev/null
-+++ b/modules.d/01fips/fips-load-crypto.sh
-@@ -0,0 +1,8 @@
-+#!/bin/sh
-+
-+if ! fipsmode=$(getarg fips) || [ $fipsmode = "0" ]; then
-+    rm -f -- /etc/modprobe.d/fips.conf >/dev/null 2>&1
-+else
-+    . /sbin/fips.sh
-+    fips_load_crypto || die "FIPS integrity test failed"
-+fi
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index 9bc089f2..beaa692b 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -69,15 +69,8 @@ do_rhevh_check()
-     return 0
- }
- 
--do_fips()
-+fips_load_crypto()
- {
--    local _v
--    local _s
--    local _v
--    local _module
--
--    KERNEL=$(uname -r)
--
-     FIPSMODULES=$(cat /etc/fipsmodules)
- 
-     info "Loading and integrity checking all crypto modules"
-@@ -102,6 +95,16 @@ do_fips()
-     info "Self testing crypto algorithms"
-     modprobe tcrypt || return 1
-     rmmod tcrypt
-+}
-+
-+do_fips()
-+{
-+    local _v
-+    local _s
-+    local _v
-+    local _module
-+
-+    KERNEL=$(uname -r)
- 
-     info "Checking integrity of kernel"
-     if [ -e "/run/initramfs/live/vmlinuz0" ]; then
-diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index f3af4d90..18186d62 100755
---- a/modules.d/01fips/module-setup.sh
-+++ b/modules.d/01fips/module-setup.sh
-@@ -54,6 +54,7 @@ install() {
-     local _dir
-     inst_hook pre-trigger 01 "$moddir/fips-boot.sh"
-     inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
-+    inst_hook pre-udev 01 "$moddir/fips-load-crypto.sh"
-     inst_script "$moddir/fips.sh" /sbin/fips.sh
- 
-     inst_multiple sha512hmac rmmod insmod mount uname umount
-

SOURCES/0013.patch

@@ -1,51 +0,0 @@
-From a1435c3d535707f1d21aaf85e62175ff2bb1ad2b Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Thu, 14 Mar 2019 18:54:10 +0800
-Subject: [PATCH] fips: ensure fs module for /boot is installed
-
-When using dracut with  --hostonly and --no-hostonly-default-device,
-/boot will be inaccessible as dracut will most fs modules unless
-specified. But FIPS require /boot to be accessible, and it will try
-to mount it on boot. It will fail if corresponding fs module is missing.
-
-For most case /boot will be a simple partition, include the fs module
-will be enough for FIPS to mount it. For other cases users have to pass
-extra parameters by themselves.
-
-Suggested-by: Kenneth Dsouza <kdsouza@redhat.com>
-Signed-off-by: Kairui Song <kasong@redhat.com>
----
- modules.d/01fips/module-setup.sh | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index 18186d62..89734a09 100755
---- a/modules.d/01fips/module-setup.sh
-+++ b/modules.d/01fips/module-setup.sh
-@@ -12,7 +12,7 @@ depends() {
- 
- # called by dracut
- installkernel() {
--    local _fipsmodules _mod
-+    local _fipsmodules _mod _bootfstype
-     if [[ -f "${srcmods}/modules.fips" ]]; then
-         _fipsmodules="$(cat "${srcmods}/modules.fips")"
-     else
-@@ -47,6 +47,16 @@ installkernel() {
-             echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
-         fi
-     done
-+
-+    # with hostonly_default_device fs module for /boot is not installed by default
-+    if [[ $hostonly ]] && [[ "$hostonly_default_device" == "no" ]]; then
-+        _bootfstype=$(find_mp_fstype /boot)
-+        if [[ -n "$_bootfstype" ]]; then
-+            hostonly='' instmods $_bootfstype
-+        else
-+            dwarning "Can't determine fs type for /boot, FIPS check may fail."
-+        fi
-+    fi
- }
- 
- # called by dracut
-

SOURCES/0014.patch

@@ -1,49 +0,0 @@
-From 7c35556da4c803bbb08c96e96262e598d5c42274 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 21 Aug 2018 13:14:44 +0200
-Subject: [PATCH] network: skip already enslaved interfaces
-
-(cherry picked from commit f6e3b59e5ea6f52a25631557badc7f4dfabbd7ee)
-
-Resolves: #1625042
----
- modules.d/35network-legacy/ifup.sh | 6 +++++-
- modules.d/40network/net-lib.sh     | 7 +++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/35network-legacy/ifup.sh b/modules.d/35network-legacy/ifup.sh
-index ea2a67ff..b4f5bf10 100755
---- a/modules.d/35network-legacy/ifup.sh
-+++ b/modules.d/35network-legacy/ifup.sh
-@@ -408,7 +408,11 @@ for p in $(getargs ip=); do
-     esac
- 
-     # If this option isn't directed at our interface, skip it
--    [ -n "$dev" ] && [ "$dev" != "$netif" ] && continue
-+    if [ -n "$dev" ]; then
-+        [ "$dev" != "$netif" ] && continue
-+    else
-+        iface_is_enslaved "$netif" && continue
-+    fi
- 
-     # Store config for later use
-     for i in ip srv gw mask hostname macaddr mtu dns1 dns2; do
-diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
-index 7b93f25e..f9569573 100755
---- a/modules.d/40network/net-lib.sh
-+++ b/modules.d/40network/net-lib.sh
-@@ -745,6 +745,13 @@ iface_has_link() {
-     iface_has_carrier "$@"
- }
- 
-+iface_is_enslaved() {
-+    local _li
-+    _li=$(ip -o link show dev $1)
-+    strstr "$li" " master " || return 1
-+    return 0
-+}
-+
- find_iface_with_link() {
-     local iface_path="" iface=""
-     for iface_path in /sys/class/net/*; do
-

SOURCES/0015.patch

@@ -1,24 +0,0 @@
-From 4971a2c4eb4526cb88a5c9aff30c57527a746036 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Tue, 16 Jul 2019 08:27:01 +0100
-Subject: [PATCH] 01fips: add cfb cipher
-
-Required by FIPS standard
----
- modules.d/01fips/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
-index 89734a09..f011f15d 100755
---- a/modules.d/01fips/module-setup.sh
-+++ b/modules.d/01fips/module-setup.sh
-@@ -24,7 +24,7 @@ installkernel() {
-         _fipsmodules+="crc32c crct10dif ghash "
- 
-         # Ciphers:
--        _fipsmodules+="cipher_null des3_ede aes "
-+        _fipsmodules+="cipher_null des3_ede aes cfb "
- 
-         # Modes/templates:
-         _fipsmodules+="ecb cbc ctr xts gcm ccm authenc hmac cmac "
-

SOURCES/0016.patch

@@ -1,86 +0,0 @@
-From 31116110ff0090324a568ce2aba6519a860d66b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
-Date: Thu, 11 Jul 2019 10:50:40 +0200
-Subject: [PATCH] rngd: new module running early during boot to help generating
- entropy when system's default entropy sources are poor (e.g. use of SSD disks
- or UEFI RNG not available)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On systems with low entropy at boot, the boot can take up to several
-hours, specially when NBDE is used (e.g. clevis) which makes use of
-the random number generator.
-
-Enabling rngd service at boot early, because dracut-initqueue runs,
-enables to initialize the random number generator in a couple of seconds
-instead of minutes or hours.
-
-Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
-(cherry picked from commit adee5b97bc5418b6e357342bb3be20568668aa55)
-
-Resolves: #1726617
----
- modules.d/06rngd/module-setup.sh | 39 +++++++++++++++++++++++++++++++++++++++
- modules.d/06rngd/rngd.service    |  7 +++++++
- 2 files changed, 46 insertions(+)
-
-diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh
-new file mode 100644
-index 00000000..43d5c2d3
---- /dev/null
-+++ b/modules.d/06rngd/module-setup.sh
-@@ -0,0 +1,39 @@
-+#!/bin/bash
-+# vim: set tabstop=8 shiftwidth=4 softtabstop=4 expandtab smarttab colorcolumn=80:
-+#
-+# Copyright (c) 2019 Red Hat, Inc.
-+# Author: Renaud Métrich <rmetrich@redhat.com>
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+depends() {
-+    echo systemd
-+    return 0
-+}
-+
-+check() {
-+    # if there's no rngd binary, no go.
-+    require_binaries rngd || return 1
-+
-+    return 0
-+}
-+
-+install() {
-+    inst rngd
-+    inst_simple "${moddir}/rngd.service" "${systemdsystemunitdir}/rngd.service"
-+    mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants"
-+    ln -rfs "${initdir}${systemdsystemunitdir}/rngd.service" \
-+        "${initdir}${systemdsystemunitdir}/sysinit.target.wants/rngd.service"
-+}
-diff --git a/modules.d/06rngd/rngd.service b/modules.d/06rngd/rngd.service
-new file mode 100644
-index 00000000..570fbedb
---- /dev/null
-+++ b/modules.d/06rngd/rngd.service
-@@ -0,0 +1,7 @@
-+[Unit]
-+Description=Hardware RNG Entropy Gatherer Daemon
-+DefaultDependencies=no
-+Before=systemd-udevd.service
-+
-+[Service]
-+ExecStart=/usr/sbin/rngd -f
-

SOURCES/0017.patch

@@ -1,22 +0,0 @@
-From d86dfcd148e5d726f00b8a83eeadb11aa0017fba Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 22 Jul 2019 14:07:26 +0200
-Subject: [PATCH] dracut.spec: add 06rngd
-
----
- dracut.spec | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dracut.spec b/dracut.spec
-index de57703c..92c7f7bf 100644
---- a/dracut.spec
-+++ b/dracut.spec
-@@ -346,6 +346,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
- %{dracutlibdir}/modules.d/03rescue
- %{dracutlibdir}/modules.d/04watchdog
- %{dracutlibdir}/modules.d/05busybox
-+%{dracutlibdir}/modules.d/06rngd
- %{dracutlibdir}/modules.d/10i18n
- %{dracutlibdir}/modules.d/30convertfs
- %{dracutlibdir}/modules.d/45url-lib
-

SOURCES/0018.patch

@@ -1,49 +0,0 @@
-From 927428e6a5e90b2214ee9edf15d4eb6c0fc5c203 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Mon, 11 Mar 2019 18:44:02 +0800
-Subject: [PATCH] squash: squash systemd binary and udevadm
-
-systemd binary and udevadm are not needed to be outside the squash
-image. Some binaries are kept outside because they are required before
-mounting the image, or after umounting the image (when switching root),
-or they may block umounting the image. But we are using lazy umounting,
-so actually nothing will block the umount.
-
-Keep more binaries outside the squash image won't hurt but cost extra
-memories, the idea of squash image is to save memory usage.
-
-So, there is no reason to keep udevadm outside, that should be a debug
-left over. For systemd binary, it's running when switch root happens,
-But we have lazy umounted the image and overlay, once systemd process
-exec the new systemd in new root, everything will be cleared by kernel.
-
-Also tidy up the comment make it less confussing.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
-(cherry picked from commit e1e1f6e8e6747d8f32c065e267e0a57587818c9e)
-
-Resolves: #1691705
----
- dracut.sh | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e683a9bc..a0158f22 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1772,9 +1772,11 @@ if dracut_module_included "squash"; then
-         mv $initdir/$folder $squash_dir/$folder
-     done
- 
--    # Reinstall required files, because we have moved some important folders to $squash_dir
--    inst_multiple "echo" "sh" "mount" "modprobe" "mkdir" \
--        "systemctl" "udevadm" "$systemdutildir/systemd"
-+    # Reinstall required files for the squash image setup script.
-+    # We have moved them inside the squashed image, but they need to be
-+    # accessible before mounting the image. Also install systemctl,
-+    # it's requires for switch-root, but we will umount the image before switch-root
-+    inst_multiple "echo" "sh" "mount" "modprobe" "mkdir" "systemctl"
-     hostonly="" instmods "loop" "squashfs" "overlay"
- 
-     for folder in "${squash_candidate[@]}"; do
-

SOURCES/0019.patch

@@ -1,71 +0,0 @@
-From b6d52b504fc7eefc3f405f75463d9e818471ee99 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Mon, 11 Mar 2019 19:46:19 +0800
-Subject: [PATCH] squash: fix and simplify required_in_root
-
-If required target is a symbol link, create the link then following the
-link. If it's a directory, create new directory, else just move it.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
-(cherry picked from commit 11ce69e4bd9172cf54251ea62bb4a5ead1700fd6)
-
-Resolves: #1691705
----
- dracut.sh | 42 +++++++++++++++++++-----------------------
- 1 file changed, 19 insertions(+), 23 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index a0158f22..6de88b3e 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1811,30 +1811,26 @@ if dracut_module_included "squash"; then
-             required_in_root $(dirname $file)
-         fi
- 
--        if [[ -d $_sqsh_file ]]; then
--            if [[ -L $_sqsh_file ]]; then
--                cp --preserve=all -P $_sqsh_file $_init_file
--            else
--                mkdir $_init_file
--            fi
-+        if [[ -L $_sqsh_file ]]; then
-+          cp --preserve=all -P $_sqsh_file $_init_file
-+          _sqsh_file=$(realpath $_sqsh_file 2>/dev/null)
-+          if [[ -e $_sqsh_file ]] && [[ "$_sqsh_file" == "$squash_dir"* ]]; then
-+            # Relative symlink
-+            required_in_root ${_sqsh_file#$squash_dir/}
-+            return
-+          fi
-+          if [[ -e $squash_dir$_sqsh_file ]]; then
-+            # Absolute symlink
-+            required_in_root ${_sqsh_file#/}
-+            return
-+          fi
-+          required_in_root ${module_spec#$squash_dir/}
-         else
--            if [[ -L $_sqsh_file ]]; then
--                cp --preserve=all -P $_sqsh_file $_init_file
--                _sqsh_file=$(realpath $_sqsh_file 2>/dev/null)
--                if [[ -e $_sqsh_file ]] && [[ "$_sqsh_file" == "$squash_dir"* ]]; then
--                    # Relative symlink
--                    required_in_root ${_sqsh_file#$squash_dir/}
--                    return
--                fi
--                if [[ -e $squash_dir$_sqsh_file ]]; then
--                    # Absolute symlink
--                    required_in_root ${_sqsh_file#/}
--                    return
--                fi
--                required_in_root ${module_spec#$squash_dir/}
--            else
--                mv $_sqsh_file $_init_file
--            fi
-+          if [[ -d $_sqsh_file ]]; then
-+            mkdir $_init_file
-+          else
-+            mv $_sqsh_file $_init_file
-+          fi
-         fi
-     }
- 
-

SOURCES/0020.patch

@@ -1,94 +0,0 @@
-From 829ed8ef5cca250fac475ad6b0265c792c3af015 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Wed, 13 Mar 2019 17:36:53 +0800
-Subject: [PATCH] squash: also squash systemctl if switch-root is not needed
-
-systemctl need to be accessible on switch-root, but we unmount the
-squash image on switch-root, so it will fail. systemctl depends on a lot
-of libraries, squash them can save more RAM. So allow modules
-(eg. kdump) to tell dracut that switch-root will be intercepted,
-then we don't need to take care of that.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
-(cherry picked from commit 3ee0ca5eb74be5d1fbd0e6d643f6fff06234177f)
-
-Resolves: #1691705
----
- dracut-init.sh |  4 ++++
- dracut.sh      | 40 ++++++++++++++++++++++------------------
- 2 files changed, 26 insertions(+), 18 deletions(-)
-
-diff --git a/dracut-init.sh b/dracut-init.sh
-index 50d23e2d..b1ac9966 100644
---- a/dracut-init.sh
-+++ b/dracut-init.sh
-@@ -150,6 +150,10 @@ dracut_module_included() {
-     [[ " $mods_to_load $modules_loaded " == *\ $*\ * ]]
- }
- 
-+dracut_no_switch_root() {
-+    >"$initdir/lib/dracut/no-switch-root"
-+}
-+
- if ! [[ $DRACUT_INSTALL ]]; then
-     DRACUT_INSTALL=$(find_binary dracut-install)
- fi
-diff --git a/dracut.sh b/dracut.sh
-index 6de88b3e..8144a16e 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1772,24 +1772,6 @@ if dracut_module_included "squash"; then
-         mv $initdir/$folder $squash_dir/$folder
-     done
- 
--    # Reinstall required files for the squash image setup script.
--    # We have moved them inside the squashed image, but they need to be
--    # accessible before mounting the image. Also install systemctl,
--    # it's requires for switch-root, but we will umount the image before switch-root
--    inst_multiple "echo" "sh" "mount" "modprobe" "mkdir" "systemctl"
--    hostonly="" instmods "loop" "squashfs" "overlay"
--
--    for folder in "${squash_candidate[@]}"; do
--        # Remove duplicated files in squashfs image, save some more space
--        [[ ! -d $initdir/$folder/ ]] && continue
--        for file in $(find $initdir/$folder/ -not -type d);
--        do
--            if [[ -e $squash_dir${file#$initdir} ]]; then
--                mv $squash_dir${file#$initdir} $file
--            fi
--        done
--    done
--
-     # Move some files out side of the squash image, including:
-     # - Files required to boot and mount the squashfs image
-     # - Files need to be accessable without mounting the squash image
-@@ -1851,6 +1833,28 @@ if dracut_module_included "squash"; then
-     ln -s squash/init.sh $initdir/init
-     ln -s squash/shutdown.sh $initdir/shutdown
- 
-+    # Reinstall required files for the squash image setup script.
-+    # We have moved them inside the squashed image, but they need to be
-+    # accessible before mounting the image.
-+    inst_multiple "echo" "sh" "mount" "modprobe" "mkdir"
-+    hostonly="" instmods "loop" "squashfs" "overlay"
-+
-+    # Only keep systemctl outsite if we need switch root
-+    if [[ ! -f "$initdir/lib/dracut/no-switch-root" ]]; then
-+      inst "systemctl"
-+    fi
-+
-+    for folder in "${squash_candidate[@]}"; do
-+        # Remove duplicated files in squashfs image, save some more space
-+        [[ ! -d $initdir/$folder/ ]] && continue
-+        for file in $(find $initdir/$folder/ -not -type d);
-+        do
-+            if [[ -e $squash_dir${file#$initdir} ]]; then
-+                mv $squash_dir${file#$initdir} $file
-+            fi
-+        done
-+    done
-+
-     mksquashfs $squash_dir $squash_img -comp xz -b 64K -Xdict-size 100% &> /dev/null
- 
-     if [[ $? != 0 ]]; then
-

SOURCES/0021.patch

@@ -1,94 +0,0 @@
-From 7ee74e539dba61c3765afe34426b085eff0de027 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Thu, 21 Feb 2019 13:18:37 +0800
-Subject: [PATCH] dracut: let module handling function accept optional path
- option
-
-Let the caller pass in the module path instead of try to find the module
-path everytime. This helps optimize the overall runtime.
-
-Test results (3 rounds) on Fedora 30 in KVM VM with 8 CPUs, 2G memory, HDD:
-
-    $ time ./dracut.sh --local --quiet --hostonly --hostonly-cmdline --hostonly-i18n --hostonly-mode 'strict' -o 'plymouth dash resume ifcfg' --mount '/dev/mapper/fedora-root /sysroot xfs defaults' --no-hostonly-default-device -f initramfs.img
-    Before the commit:
-    real    0m11.782s  |  real    0m11.505s  |  real    0m11.958s
-    user    0m9.169s   |  user    0m9.218s   |  user    0m9.327s
-    sys     0m10.839s  |  sys     0m10.829s  |  sys     0m10.925s
-
-    After this commit:
-    real    0m9.866s  |  real    0m9.580s  |  real    0m9.638s
-    user    0m9.048s  |  user    0m9.142s  |  user    0m9.120s
-    sys     0m7.411s  |  sys     0m7.775s  |  sys     0m7.745s
-
-Test result of building a ordinary image:
-
-    $ time ./dracut.sh --local --quiet -f initramfs.img
-    Before the commit:
-    real    0m34.697s  |  real    0m34.371s  |  real    0m35.122s
-    user    0m27.608s  |  user    0m27.524s  |  user    0m27.705s
-    sys     0m22.341s  |  sys     0m22.032s  |  sys     0m22.246s
-
-    After the commit:
-    real    0m31.914s  |  real    0m31.006  |  real    0m31.289ss
-    user    0m27.315s  |  user    0m27.324  |  user    0m27.290ss
-    sys     0m19.051s  |  sys     0m18.916  |  sys     0m19.022ss
-
-This will have an ~2s speed up.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
-(cherry picked from commit 5916d31b24ad9eb21fd376929a96c459813315a1)
-
-Cherry-picked from: 5916d31b
-Resolves: #1734047
----
- dracut-init.sh | 4 ++++
- dracut.sh      | 8 ++++----
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/dracut-init.sh b/dracut-init.sh
-index b1ac9966..ab07cabf 100644
---- a/dracut-init.sh
-+++ b/dracut-init.sh
-@@ -154,6 +154,10 @@ dracut_no_switch_root() {
-     >"$initdir/lib/dracut/no-switch-root"
- }
- 
-+dracut_module_path() {
-+    echo ${dracutbasedir}/modules.d/??${1} | { read a b; echo "$a"; }
-+}
-+
- if ! [[ $DRACUT_INSTALL ]]; then
-     DRACUT_INSTALL=$(find_binary dracut-install)
- fi
-diff --git a/dracut.sh b/dracut.sh
-index 8144a16e..f270af76 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1373,7 +1373,7 @@ do_print_cmdline()
-     for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
-         _d_mod=${moddir##*/}; _d_mod=${_d_mod#[0-9][0-9]}
-         [[ ${_mods_to_print[$_d_mod]} ]] || continue
--        module_cmdline "$_d_mod"
-+        module_cmdline "$_d_mod" "$moddir"
-     done
-     unset moddir
- }
-@@ -1454,14 +1454,14 @@ for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
-         dinfo "*** Including module: $_d_mod ***"
-     fi
-     if [[ $kernel_only == yes ]]; then
--        module_installkernel "$_d_mod" || {
-+        module_installkernel "$_d_mod" "$moddir" || {
-             dfatal "installkernel failed in module $_d_mod"
-             exit 1
-         }
-     else
--        module_install "$_d_mod"
-+        module_install "$_d_mod" "$moddir"
-         if [[ $no_kernel != yes ]]; then
--            module_installkernel "$_d_mod" || {
-+            module_installkernel "$_d_mod" "$moddir" || {
-                 dfatal "installkernel failed in module $_d_mod"
-                 exit 1
-             }
-

SOURCES/0022.patch

@@ -1,36 +0,0 @@
-From 17cd55169c3549d85ba3e4d7e0e81c496d1b2940 Mon Sep 17 00:00:00 2001
-From: Lianbo Jiang <lijiang@redhat.com>
-Date: Mon, 13 May 2019 16:09:25 +0800
-Subject: [PATCH] 99base: enable the initqueue in both 'dracut --add-device'
- and 'dracut --mount' cases.
-
-The commit 9f3c31cd8d68 ("99base: enable initqueue if extra devices are added")
-only covers 'dracut --add-device' case, but it did not cover 'dracut --mount'
-case, which causes the kdump failure in the Amazon virtual machine.
-
-Lets make sure that the initqueue is enabled in both cases in order to wake up
-the device in time.
-
-Reported-by: Xiao Liang <xiliang@redhat.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
-(cherry picked from commit e0fc62f619ba55a96179382e22f7665e969c3d42)
-
-Resolves: #1678094
----
- modules.d/99base/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index 21523fc9..c9ead01d 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -93,7 +93,7 @@ install() {
- 
-     ## save host_devs which we need bring up
-     if [[ $hostonly_cmdline == "yes" ]]; then
--        if [[ -n $add_device ]]; then
-+        if [[ -n "${host_devs[@]}" ]]; then
-             dracut_need_initqueue
-         fi
-         if [[ -f "$initdir/lib/dracut/need-initqueue" ]] || ! dracut_module_included "systemd"; then
-

SOURCES/0023.patch

@@ -1,34 +0,0 @@
-From 1851348709df5413a767faecdee908534baf0da1 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Wed, 12 Jun 2019 14:27:44 +0800
-Subject: [PATCH] 95fcoe: load 'libfcoe' module as a fallback
-
-The kernel may only enable 'libfcoe' module. Some modules like bnx2fc
-provides FCoE but only depend on 'libfcoe'. Loading 'fcoe' module may
-fail but the kernel do support FCoE.
-
-'libfcoe' will be installed as a dependency when installing block device
-drivers if it's required. So no need to install it in installkernel.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
-(cherry picked from commit 65fe1af2eca7d0ed340520577ab861fcd695b34a)
-
-Resolves: #1719645
----
- modules.d/95fcoe/parse-fcoe.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh
-index 75cca9a5..12701cdb 100755
---- a/modules.d/95fcoe/parse-fcoe.sh
-+++ b/modules.d/95fcoe/parse-fcoe.sh
-@@ -18,7 +18,7 @@
- # If it's not set we don't continue
- [ -z "$fcoe" ] && return
- 
--[ -e /sys/bus/fcoe/ctlr_create ] || modprobe -b -a fcoe || die "FCoE requested but kernel/initrd does not support FCoE"
-+[ -e /sys/bus/fcoe/ctlr_create ] || modprobe -b -a fcoe || modprobe -b -a libfcoe || die "FCoE requested but kernel/initrd does not support FCoE"
- 
- initqueue --onetime modprobe -b -q bnx2fc
- 
-

SOURCES/0024.patch

@@ -1,36 +0,0 @@
-From 9b2497dffb8f699ce040cdbafa967f5fe02b57b6 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Fri, 2 Aug 2019 14:26:23 +0200
-Subject: [PATCH] 90kernel-modules-extra: don't resolve symlinks before instmod
-
-When you install a third-party driver, you will probably end in a
-situation, where the module will be in a different directory and
-in $depmod_module_dir you will only have symlink. If we resolve the
-symlink before we pass the module path to instmod, the dracut-install
-will only include the module with its original path, but not the
-symlink. Hence the module can't be automatically loaded.
-
-Dracut-install is clever enough to handle symlinks and will include both
-the symlink and the module to the initrd.
-
-(cherry picked from commit d1afff43aea01c8d43817adf3ac4041dd4b9f022)
-
-Resolves: #1720275
----
- modules.d/90kernel-modules-extra/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90kernel-modules-extra/module-setup.sh b/modules.d/90kernel-modules-extra/module-setup.sh
-index c0a2b7f9..1706c822 100755
---- a/modules.d/90kernel-modules-extra/module-setup.sh
-+++ b/modules.d/90kernel-modules-extra/module-setup.sh
-@@ -187,7 +187,7 @@ installkernel()
- 	printf "^%s\.ko(\.gz|\.bz2|\.xz)?:\n" "${pathlist[@]}" \
- 		| (LANG=C grep -E -o -f - -- "$depmod_modules_dep" || exit 0) \
- 		| tr -d ':' \
--		| (cd "$depmod_module_dir" || exit; xargs -r realpath -e --) \
-+		| (cd "$depmod_module_dir" || exit; xargs -r realpath -se --) \
- 		| instmods || return 1
- 
- 	return 0
-

SOURCES/0025.patch

@@ -1,26 +0,0 @@
-From 3464297288b50a062e1094e57d46ad21e51b351b Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Tue, 6 Aug 2019 10:54:09 +0200
-Subject: [PATCH] net-lib: fix typo $li -> $_li
-
-(cherry picked from commit cd97d8d2c0646b95aee47efd5eee39f29d617a67)
-
-Resolves: #1625042
----
- modules.d/40network/net-lib.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
-index f9569573..ad78d225 100755
---- a/modules.d/40network/net-lib.sh
-+++ b/modules.d/40network/net-lib.sh
-@@ -748,7 +748,7 @@ iface_has_link() {
- iface_is_enslaved() {
-     local _li
-     _li=$(ip -o link show dev $1)
--    strstr "$li" " master " || return 1
-+    strstr "$_li" " master " || return 1
-     return 0
- }
- 
-

SOURCES/0026.patch

@@ -1,38 +0,0 @@
-From 95bbcaa8550534f03b332487ef3a2ed6650424fe Mon Sep 17 00:00:00 2001
-From: Frantisek Sumsal <frantisek@sumsal.cz>
-Date: Wed, 21 Aug 2019 11:16:07 +0200
-Subject: [PATCH] git2spec: avoid malforming of SHA-1 hashes
-
-When a SHA-1 hash of a specific commit is used as a tag, the regex
-shenanigans later in the script can (and will) corrupt it in certain
-cases.
-
-e.g.:
-$ perl -e '
-$tag="6e8cd92261577230daa1098f7e05ec198c3c4281";
-$tag=~s/[^0-9]+?([0-9]+)/$1/;
-print("$tag\n");
-'
-68cd92261577230daa1098f7e05ec198c3c4281
-
-(Notice the missing 'e')
-
-Let's fix this by limiting the regex's scope to a non-SHA-1 tags only.
----
- git2spec.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/git2spec.pl b/git2spec.pl
-index 7853791e..9ddc3805 100755
---- a/git2spec.pl
-+++ b/git2spec.pl
-@@ -37,7 +37,7 @@ $tag=`git describe --abbrev=0 --tags` if not defined $tag;
- chomp($tag);
- my @patches=&create_patches($tag, $pdir);
- my $num=$#patches + 2;
--$tag=~s/[^0-9]+?([0-9]+)/$1/;
-+$tag=~s/[^0-9]+?([0-9]+)/$1/ if $tag !~ /\b[0-9a-f]{5,40}\b/;
- my $release="$num.git$datestr";
- $release="1" if $num == 1;
- 
-

SOURCES/0027.patch

@@ -1,25 +0,0 @@
-From d3f542cc9d0135a408be7ba995b8adad80bcd606 Mon Sep 17 00:00:00 2001
-From: Frantisek Sumsal <frantisek@sumsal.cz>
-Date: Wed, 21 Aug 2019 14:06:29 +0200
-Subject: [PATCH] travis: fetch only tags
-
-The original `git pull` would try to pull & merge changes from the
-master branch, which breaks CI runs on PRs based on non-master branches
----
- .travis.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index f913db57..efb0df1b 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -29,7 +29,7 @@ before_script:
-     sudo modprobe kvm-intel nested=1 || :
-     sudo modprobe kvm-amd nested=1 || :
-     dmesg | tail || :
--  - git pull --depth=100
-+  - git fetch --tags --unshallow
-   - |
-     git describe --abbrev=0 --tags || :
-     git describe --tags || :
-

SOURCES/0028.patch

@@ -1,98 +0,0 @@
-From e3b2b02c7f5b4e9f1d2a3cfe8749534959e29e3e Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Fri, 21 Jun 2019 18:39:48 +0200
-Subject: [PATCH] fs-lib: drop a bashism
-
-Bash 5 apparently longer propagates variable assignments to local variables
-in front of function calls when in POSIX mode:
-
-  [lkundrak@demiurge ~]$ cat feh.sh
-  print_VAR () {
-          echo "$VAR";
-  }
-
-  testfunc () {
-          local VAR="OLD"
-          VAR=NEW print_VAR
-  }
-
-  testfunc
-  [lkundrak@demiurge ~]$ bash4 --posix feh.sh
-  NEW
-  [lkundrak@demiurge ~]$ bash5 --posix feh.sh
-  OLD
-  [lkundrak@demiurge ~]$ bash5 feh.sh
-  NEW
-  [lkundrak@demiurge ~]$
-
-It works the way it did in Bash 4 in non-POSIX mode, for external programs,
-or for non-local variables. Don't ask me why -- it's probably some
-compatibility thing for some sad old people.
-
-However, this precisely happens when fsck_single() is calling into the
-fsck_drv_com(), assigned to _drv by fsck_able(). That ruins the
-TEST-70-BONDBRIDGETEAMVLAN test's server and probably more.
-
-Let's pass the fsck driver binary via the function argument instead. It's
-less messy anyway.
-
-(cherry picked from commit 43c8c4ce0471abbb8c0fc4b8be2515cebc636030)
----
- modules.d/99fs-lib/fs-lib.sh | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index d39ca1b7..11e795d9 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -44,22 +44,22 @@ fsck_able() {
-             ;;
-         ext?)
-             type e2fsck >/dev/null 2>&1 &&
--            _drv="_drv=e2fsck fsck_drv_com" &&
-+            _drv="fsck_drv_com e2fsck" &&
-             return 0
-             ;;
-         f2fs)
- 	    type fsck.f2fs >/dev/null 2>&1 &&
--	    _drv="_drv=fsck.f2fs fsck_drv_com" &&
-+	    _drv="fsck_drv_com fsck.f2fs" &&
- 	    return 0
- 	    ;;
-         jfs)
-             type jfs_fsck >/dev/null 2>&1 &&
--            _drv="_drv=jfs_fsck fsck_drv_com" &&
-+            _drv="fsck_drv_com jfs_fsck" &&
-             return 0
-             ;;
-         reiserfs)
-             type reiserfsck >/dev/null 2>&1 &&
--            _drv="_drv=reiserfsck fsck_drv_com" &&
-+            _drv="fsck_drv_com reiserfsck" &&
-             return 0
-             ;;
-         btrfs)
-@@ -70,12 +70,12 @@ fsck_able() {
-             ;;
-         nfs*)
-             # nfs can be a nop, returning success
--            _drv="_drv=none :" &&
-+            _drv=":" &&
-             return 0
-             ;;
-         *)
-             type fsck >/dev/null 2>&1 &&
--            _drv="_drv=fsck fsck_drv_std" &&
-+            _drv="fsck_drv_std fsck" &&
-             return 0
-             ;;
-     esac
-@@ -97,6 +97,7 @@ fsck_drv_btrfs() {
- 
- # common code for checkers that follow usual subset of options and return codes
- fsck_drv_com() {
-+    local _drv="$1"
-     local _ret
-     local _out
- 
-

SOURCES/0029.patch

@@ -1,79 +0,0 @@
-From e671c3a06a7e58461d4e9c9f3546cf6eac809300 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 4 Dec 2018 10:27:17 +0100
-Subject: [PATCH] 95iscsi/module-setup.sh: do not require 'hostname' anymore
-
-(cherry picked from commit ebe1821635dd99f07c817179ee5358d27aab53c5)
-
-[lkundrak@v3.sk: fixes TEST-30 that fails with: dracut: dracut module
-'iscsi' will not be installed, because command 'hostname' could not be
-found!]
----
- modules.d/40network/netroot.sh               | 2 +-
- modules.d/95iscsi/module-setup.sh            | 4 ++--
- modules.d/98dracut-systemd/dracut-cmdline.sh | 2 +-
- modules.d/99base/init.sh                     | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/modules.d/40network/netroot.sh b/modules.d/40network/netroot.sh
-index 207364cd..654cfc72 100755
---- a/modules.d/40network/netroot.sh
-+++ b/modules.d/40network/netroot.sh
-@@ -66,7 +66,7 @@ if [ -z "$2" ]; then
- 
-     # Check: do we really know how to handle (net)root?
-     [ -z "$root" ] && die "No or empty root= argument"
--    [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
-+    [ -z "$rootok" ] && die "X2 Don't know how to handle 'root=$root'"
- 
-     handler=${netroot%%:*}
-     handler=${handler%%4}
-diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
-index 79af4a47..f6f3520d 100755
---- a/modules.d/95iscsi/module-setup.sh
-+++ b/modules.d/95iscsi/module-setup.sh
-@@ -4,7 +4,7 @@
- check() {
-     local _rootdev
-     # If our prerequisites are not met, fail anyways.
--    require_binaries hostname iscsi-iname iscsiadm iscsid || return 1
-+    require_binaries iscsi-iname iscsiadm iscsid || return 1
- 
-     # If hostonly was requested, fail the check if we are not actually
-     # booting from root.
-@@ -206,7 +206,7 @@ cmdline() {
- install() {
-     inst_multiple -o iscsiuio
-     inst_libdir_file 'libgcc_s.so*'
--    inst_multiple umount hostname iscsi-iname iscsiadm iscsid
-+    inst_multiple umount iscsi-iname iscsiadm iscsid
- 
-     inst_multiple -o \
-         $systemdsystemunitdir/iscsid.socket \
-diff --git a/modules.d/98dracut-systemd/dracut-cmdline.sh b/modules.d/98dracut-systemd/dracut-cmdline.sh
-index bff9435a..89c52d13 100755
---- a/modules.d/98dracut-systemd/dracut-cmdline.sh
-+++ b/modules.d/98dracut-systemd/dracut-cmdline.sh
-@@ -76,7 +76,7 @@ case "${root}${root_unset}" in
- esac
- 
- [ -z "${root}${root_unset}" ] && die "Empty root= argument"
--[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
-+[ -z "$rootok" ] && die "X1 Don't know how to handle 'root=$root'"
- 
- export root rflags fstype netroot NEWROOT
- 
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index e4f7cff1..3e20069f 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -136,7 +136,7 @@ getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Br
- source_hook cmdline
- 
- [ -z "$root" ] && die "No or empty root= argument"
--[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
-+[ -z "$rootok" ] && die "X0 Don't know how to handle 'root=$root'"
- 
- export root rflags fstype netroot NEWROOT
- 
-

SOURCES/0030.patch

@@ -1,24 +0,0 @@
-From 50192de38d756203a414405e2d7552e89b1c0423 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 4 Dec 2018 10:06:12 +0100
-Subject: [PATCH] test/test-functions: correctly move server.log
-
-(cherry picked from commit 712f471ebfae70fd71c0c740e9a3e120464ca7e7)
----
- test/test-functions | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test-functions b/test/test-functions
-index a6254ec7..51b3df80 100644
---- a/test/test-functions
-+++ b/test/test-functions
-@@ -80,7 +80,7 @@ while (($# > 0)); do
-                     ret=$?
-                     test_cleanup
-                     if ((ret!=0)) && [[ -f "$TESTDIR"/server.log ]]; then
--                        mv [[ -f "$TESTDIR"/server.log ]] ./server${TEST_RUN_ID:+-$TEST_RUN_ID}.log
-+                        mv "$TESTDIR"/server.log ./server${TEST_RUN_ID:+-$TEST_RUN_ID}.log
-                     fi
-                     rm -fr -- "$TESTDIR"
-                     rm -f -- .testdir${TEST_RUN_ID:+-$TEST_RUN_ID}
-

SOURCES/0031.patch

@@ -1,43 +0,0 @@
-From bf69beb6f3824b1ebed221c8255d1f5c9efd136a Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 26 Jun 2019 16:42:04 +0200
-Subject: [PATCH] test/TEST-17-LVM-THIN: fail setup if we run out of space in
- the thin pool
-
-This condition is rather difficult to detect -- the writes will just remain
-queued and get lost on shutdown, resulting in a corrupt filesystem.
-
-(cherry picked from commit 91c15babdf0215df59325f3086acfdf0ba247bfa)
----
- test/TEST-17-LVM-THIN/create-root.sh | 5 +++--
- test/TEST-17-LVM-THIN/test.sh        | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh
-index 117d1341..0e52f879 100755
---- a/test/TEST-17-LVM-THIN/create-root.sh
-+++ b/test/TEST-17-LVM-THIN/create-root.sh
-@@ -27,6 +27,7 @@ cp -a -t /sysroot /source/* && \
- umount /sysroot && \
- sleep 1 && \
- lvm lvchange -a n /dev/dracut/root && \
--sleep 1 && \
--echo "dracut-root-block-created" >/dev/sda1
-+sleep 1
-+dmsetup status |grep out_of_data_space || \
-+    echo "dracut-root-block-created" >/dev/sda1
- poweroff -f
-diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
-index af349246..1b36a216 100755
---- a/test/TEST-17-LVM-THIN/test.sh
-+++ b/test/TEST-17-LVM-THIN/test.sh
-@@ -56,7 +56,7 @@ test_setup() {
-     (
- 	export initdir=$TESTDIR/overlay
- 	. $basedir/dracut-init.sh
--	inst_multiple sfdisk mke2fs poweroff cp umount
-+	inst_multiple sfdisk mke2fs poweroff cp umount grep dmsetup
- 	inst_hook initqueue 01 ./create-root.sh
-         inst_hook initqueue/finished 01 ./finished-false.sh
- 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
-

SOURCES/0032.patch

@@ -1,66 +0,0 @@
-From 0f0b8c8f90cbcd56140e85b9997deda906c71118 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Tue, 25 Jun 2019 17:39:57 +0200
-Subject: [PATCH] test/TEST-14-IMSM: detect failure to compose the test setup
- root
-
-The dracut-root-block-created line should not be created if we fail to copy
-in the required files to sysroot. Let's turn on -e to trap failures and
-poweroff on them, like some other tests do.
-
-Also remove the &&. Not only it is unnecessary with -e, but defeats it.
-From bash(1):
-
-  The shell does not exit if the command that fails is [...] part of any
-  command executed in a && or || list except the command following the
-  final && or || [...]
-
-(cherry picked from commit c27ed38bb2986d31b08257782ce2b24a80415c6c)
----
- test/TEST-14-IMSM/create-root.sh | 23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh
-index f637ec88..a0324c6f 100755
---- a/test/TEST-14-IMSM/create-root.sh
-+++ b/test/TEST-14-IMSM/create-root.sh
-@@ -1,4 +1,7 @@
- #!/bin/sh
-+
-+trap 'poweroff -f' EXIT
-+
- # don't let udev and this script step on eachother's toes
- for x in 61-dmraid-imsm.rules 64-md-raid.rules 65-md-incremental-imsm.rules 65-md-incremental.rules 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
-     rm -f -- "/etc/udev/rules.d/$x"
-@@ -55,20 +58,20 @@ mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 \
- # wait for the array to finish initailizing, otherwise this sometimes fails
- # randomly.
- mdadm -W /dev/md0
-+set -e
- lvm pvcreate -ff  -y /dev/md0
--lvm vgcreate dracut /dev/md0 && \
--lvm lvcreate -l 100%FREE -n root dracut && \
--lvm vgchange -ay && \
--mke2fs -L root /dev/dracut/root && \
--mkdir -p /sysroot && \
--mount /dev/dracut/root /sysroot && \
--cp -a -t /sysroot /source/* && \
--umount /sysroot && \
--lvm lvchange -a n /dev/dracut/root && \
-+lvm vgcreate dracut /dev/md0
-+lvm lvcreate -l 100%FREE -n root dracut
-+lvm vgchange -ay
-+mke2fs -L root /dev/dracut/root
-+mkdir -p /sysroot
-+mount /dev/dracut/root /sysroot
-+cp -a -t /sysroot /source/*
-+umount /sysroot
-+lvm lvchange -a n /dev/dracut/root
- udevadm settle
- mdadm --detail --export /dev/md0 |grep -F MD_UUID > /tmp/mduuid
- . /tmp/mduuid
- echo "MD_UUID=$MD_UUID"
- { echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID;} > /dev/sda
- mdadm --wait-clean /dev/md0
--poweroff -f
-

SOURCES/0033.patch

@@ -1,346 +0,0 @@
-From e35e43c1c28a8935660fe72650614e5dc1defb65 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 26 Jun 2019 11:47:21 +0200
-Subject: [PATCH] test: tell systemd to reboot on fatal errors
-
-Otherwise systemd would freeze execution, causing the test to time out
-instead of failing fast.
-
-(cherry picked from commit 7934c6f918de2e82d0df5da557c5792c4fb7b798)
----
- test/TEST-01-BASIC/test.sh              | 2 +-
- test/TEST-02-SYSTEMD/test.sh            | 2 +-
- test/TEST-03-USR-MOUNT/test.sh          | 2 +-
- test/TEST-04-FULL-SYSTEMD/test.sh       | 2 +-
- test/TEST-10-RAID/test.sh               | 2 +-
- test/TEST-11-LVM/test.sh                | 2 +-
- test/TEST-12-RAID-DEG/test.sh           | 2 +-
- test/TEST-13-ENC-RAID-LVM/test.sh       | 6 +++---
- test/TEST-14-IMSM/test.sh               | 2 +-
- test/TEST-15-BTRFSRAID/test.sh          | 2 +-
- test/TEST-16-DMSQUASH/test.sh           | 2 +-
- test/TEST-17-LVM-THIN/test.sh           | 2 +-
- test/TEST-20-NFS/test.sh                | 4 ++--
- test/TEST-30-ISCSI/test.sh              | 4 ++--
- test/TEST-31-ISCSI-MULTI/test.sh        | 4 ++--
- test/TEST-40-NBD/test.sh                | 4 ++--
- test/TEST-50-MULTINIC/test.sh           | 4 ++--
- test/TEST-70-BONDBRIDGETEAMVLAN/test.sh | 6 +++---
- 18 files changed, 27 insertions(+), 27 deletions(-)
-
-diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
-index ed2ae5de..ca4a8288 100755
---- a/test/TEST-01-BASIC/test.sh
-+++ b/test/TEST-01-BASIC/test.sh
-@@ -15,7 +15,7 @@ test_run() {
- 	-net none \
- 	-watchdog i6300esb -watchdog-action poweroff \
-         -no-reboot \
--	-append "panic=1 root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing || return 1
-     grep -F -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
- }
-diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
-index 8c5eb168..848021e5 100755
---- a/test/TEST-02-SYSTEMD/test.sh
-+++ b/test/TEST-02-SYSTEMD/test.sh
-@@ -11,7 +11,7 @@ test_run() {
-         -m 512M  -smp 2 -nographic \
-         -net none \
-         -no-reboot \
--        -append "panic=1 root=LABEL=dracut rw loglevel=77 systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.shell=0 $DEBUGFAIL" \
-+        -append "panic=1 systemd.crash_reboot root=LABEL=dracut rw loglevel=77 systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.shell=0 $DEBUGFAIL" \
-         -initrd $TESTDIR/initramfs.testing
-     grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext3 || return 1
- }
-diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
-index 42c0da65..5d5ec8f8 100755
---- a/test/TEST-03-USR-MOUNT/test.sh
-+++ b/test/TEST-03-USR-MOUNT/test.sh
-@@ -22,7 +22,7 @@ client_run() {
- 	-net none \
- 	-watchdog i6300esb -watchdog-action poweroff \
-         -no-reboot \
--	-append "panic=1 root=LABEL=dracut $client_opts quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
- 
-     if (($? != 0)); then
-diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
-index 97528e4f..f65f30f2 100755
---- a/test/TEST-04-FULL-SYSTEMD/test.sh
-+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
-@@ -23,7 +23,7 @@ client_run() {
- 	-m 512M  -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 root=LABEL=dracut $client_opts rd.retry=3 console=ttyS0,115200n81 selinux=0 $DEBUGOUT rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts rd.retry=3 console=ttyS0,115200n81 selinux=0 $DEBUGOUT rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
- 
-     if (($? != 0)); then
-diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
-index 444126b2..0beb26c3 100755
---- a/test/TEST-10-RAID/test.sh
-+++ b/test/TEST-10-RAID/test.sh
-@@ -13,7 +13,7 @@ test_run() {
- 	-m 512M  -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 root=/dev/dracut/root rd.auto rw rd.retry=10 console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rd.auto rw rd.retry=10 console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
-     grep -F -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
- }
-diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
-index 5c105e01..a907c4b1 100755
---- a/test/TEST-11-LVM/test.sh
-+++ b/test/TEST-11-LVM/test.sh
-@@ -12,7 +12,7 @@ test_run() {
- 	-m 512M  -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
-     grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
- }
-diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
-index 4e381d84..c82cde1e 100755
---- a/test/TEST-12-RAID-DEG/test.sh
-+++ b/test/TEST-12-RAID-DEG/test.sh
-@@ -20,7 +20,7 @@ client_run() {
-         -drive format=raw,index=3,media=disk,file=$TESTDIR/disk3.img.new \
-         -net none \
-         -no-reboot \
--        -append "panic=1 $* systemd.log_target=kmsg loglevel=7 root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 log_buf_len=2M selinux=0 rd.debug rd.shell=0 $DEBUGFAIL " \
-+        -append "panic=1 systemd.crash_reboot $* systemd.log_target=kmsg loglevel=7 root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 log_buf_len=2M selinux=0 rd.debug rd.shell=0 $DEBUGFAIL " \
-         -initrd $TESTDIR/initramfs.testing
-     if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
-         echo "CLIENT TEST END: $@ [FAIL]"
-diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
-index 76ec36b3..99324ce9 100755
---- a/test/TEST-13-ENC-RAID-LVM/test.sh
-+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
-@@ -20,7 +20,7 @@ test_run() {
- 	-m 512M  -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 rd.debug rootwait $LUKSARGS rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 rd.debug rootwait $LUKSARGS rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
-     grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
-     echo "CLIENT TEST END: [OK]"
-@@ -34,7 +34,7 @@ test_run() {
- 	-m 512M  -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug  $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw quiet rd.auto rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug  $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
-     grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
-     echo "CLIENT TEST END: [OK]"
-@@ -48,7 +48,7 @@ test_run() {
- 	-m 512M  -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug  $DEBUGFAIL rd.luks.uuid=failme" \
-+	-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw quiet rd.auto rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug  $DEBUGFAIL rd.luks.uuid=failme" \
- 	-initrd $TESTDIR/initramfs.testing
-     grep -F -m 1 -q dracut-root-block-success $TESTDIR/check-success.img && return 1
-     echo "CLIENT TEST END: [OK]"
-diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
-index 8ebc285a..ed60f052 100755
---- a/test/TEST-14-IMSM/test.sh
-+++ b/test/TEST-14-IMSM/test.sh
-@@ -16,7 +16,7 @@ client_run() {
- 	-m 512M  -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 $* root=LABEL=root rw debug rd.retry=5 rd.debug console=ttyS0,115200n81 selinux=0 rd.info rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot $* root=LABEL=root rw debug rd.retry=5 rd.debug console=ttyS0,115200n81 selinux=0 rd.info rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
-     if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
- 	echo "CLIENT TEST END: $@ [FAIL]"
-diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
-index 02cb4976..dda76672 100755
---- a/test/TEST-15-BTRFSRAID/test.sh
-+++ b/test/TEST-15-BTRFSRAID/test.sh
-@@ -15,7 +15,7 @@ test_run() {
- 	-m 512M -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=LABEL=root rw rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
-     grep -F -m 1 -q dracut-root-block-success $MARKER_DISKIMAGE || return 1
- }
-diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
-index 45d8c4c0..65d5bdbb 100755
---- a/test/TEST-16-DMSQUASH/test.sh
-+++ b/test/TEST-16-DMSQUASH/test.sh
-@@ -23,7 +23,7 @@ test_run() {
-         -nographic \
-         -net none \
-         -no-reboot \
--        -append "panic=1 root=live:CDLABEL=LiveCD live rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
-+        -append "panic=1 systemd.crash_reboot root=live:CDLABEL=LiveCD live rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.shell=0 $DEBUGFAIL" \
-         -initrd "$TESTDIR"/initramfs.testing
- 
-     # mediacheck test with qemu GUI
-diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
-index 1b36a216..c13e9063 100755
---- a/test/TEST-17-LVM-THIN/test.sh
-+++ b/test/TEST-17-LVM-THIN/test.sh
-@@ -12,7 +12,7 @@ test_run() {
- 	-m 512M  -smp 2 -nographic \
- 	-net none \
-         -no-reboot \
--	-append "panic=1 root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
-+	-append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
- 	-initrd $TESTDIR/initramfs.testing
-     grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
- }
-diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
-index e942745a..4ad7fd77 100755
---- a/test/TEST-20-NFS/test.sh
-+++ b/test/TEST-20-NFS/test.sh
-@@ -22,7 +22,7 @@ run_server() {
-         ${SERIAL:--serial file:"$TESTDIR"/server.log} \
-         -watchdog i6300esb -watchdog-action poweroff \
-         -no-reboot \
--        -append "panic=1 rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
-+        -append "panic=1 systemd.crash_reboot rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
-         -initrd $TESTDIR/initramfs.server \
-         -pidfile $TESTDIR/server.pid -daemonize || return 1
-     sudo chmod 644 $TESTDIR/server.pid || return 1
-@@ -57,7 +57,7 @@ client_test() {
-         -net socket,connect=127.0.0.1:12320 \
-         -watchdog i6300esb -watchdog-action poweroff \
-         -no-reboot \
--        -append "panic=1 rd.shell=0 $cmdline $DEBUGFAIL rd.debug rd.retry=10 rd.info quiet  ro console=ttyS0,115200n81 selinux=0" \
-+        -append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.debug rd.retry=10 rd.info quiet  ro console=ttyS0,115200n81 selinux=0" \
-         -initrd $TESTDIR/initramfs.testing
- 
-     if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nfs-OK $TESTDIR/client.img; then
-diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
-index f6cc56d5..d5a6ba58 100755
---- a/test/TEST-30-ISCSI/test.sh
-+++ b/test/TEST-30-ISCSI/test.sh
-@@ -26,7 +26,7 @@ run_server() {
-         -net nic,macaddr=52:54:00:12:34:57,model=e1000 \
-         -net socket,listen=127.0.0.1:12330 \
-         -no-reboot \
--        -append "panic=1 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
-+        -append "panic=1 systemd.crash_reboot root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
-         -initrd $TESTDIR/initramfs.server \
-         -pidfile $TESTDIR/server.pid -daemonize || return 1
-     sudo chmod 644 $TESTDIR/server.pid || return 1
-@@ -51,7 +51,7 @@ run_client() {
-         -net nic,macaddr=52:54:00:12:34:01,model=e1000 \
-         -net socket,connect=127.0.0.1:12330 \
-         -no-reboot \
--        -append "panic=1 rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 rd.shell=0 $DEBUGFAIL $*" \
-+        -append "panic=1 systemd.crash_reboot rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 rd.shell=0 $DEBUGFAIL $*" \
-         -initrd $TESTDIR/initramfs.testing
-     if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
- 	echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
-diff --git a/test/TEST-31-ISCSI-MULTI/test.sh b/test/TEST-31-ISCSI-MULTI/test.sh
-index 5c38249c..20db2451 100755
---- a/test/TEST-31-ISCSI-MULTI/test.sh
-+++ b/test/TEST-31-ISCSI-MULTI/test.sh
-@@ -26,7 +26,7 @@ run_server() {
-         -net nic,macaddr=52:54:00:12:34:57,model=e1000 \
-         -net socket,listen=127.0.0.1:12331 \
-         -no-reboot \
--        -append "panic=1 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
-+        -append "panic=1 systemd.crash_reboot root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
-         -initrd $TESTDIR/initramfs.server \
-         -pidfile $TESTDIR/server.pid -daemonize || return 1
-     sudo chmod 644 $TESTDIR/server.pid || return 1
-@@ -51,7 +51,7 @@ run_client() {
-         -net nic,macaddr=52:54:00:12:34:01,model=e1000 \
-         -net socket,connect=127.0.0.1:12331 \
-         -no-reboot \
--        -append "panic=1 rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 rd.shell=0 $DEBUGFAIL $*" \
-+        -append "panic=1 systemd.crash_reboot rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 rd.shell=0 $DEBUGFAIL $*" \
-         -initrd $TESTDIR/initramfs.testing
-     if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
- 	echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
-diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
-index 12736a15..19ec5b0e 100755
---- a/test/TEST-40-NBD/test.sh
-+++ b/test/TEST-40-NBD/test.sh
-@@ -28,7 +28,7 @@ run_server() {
-         ${SERIAL:+-serial "$SERIAL"} \
-         ${SERIAL:--serial file:"$TESTDIR"/server.log} \
-         -no-reboot \
--        -append "panic=1 root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \
-+        -append "panic=1 systemd.crash_reboot root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \
-         -initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1
-     sudo chmod 644 $TESTDIR/server.pid || return 1
- 
-@@ -65,7 +65,7 @@ client_test() {
-         -net nic,macaddr=$mac,model=e1000 \
-         -net socket,connect=127.0.0.1:12340 \
-         -no-reboot \
--        -append "panic=1 rd.shell=0 $cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81  selinux=0  " \
-+        -append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81  selinux=0  " \
-         -initrd $TESTDIR/initramfs.testing
- 
-     if [[ $? -ne 0 ]] || ! grep -F -m 1 -q nbd-OK $TESTDIR/flag.img; then
-diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
-index 495a66f2..ff2961dc 100755
---- a/test/TEST-50-MULTINIC/test.sh
-+++ b/test/TEST-50-MULTINIC/test.sh
-@@ -23,7 +23,7 @@ run_server() {
-         ${SERIAL:--serial file:"$TESTDIR"/server.log} \
-         -watchdog i6300esb -watchdog-action poweroff \
-         -no-reboot \
--        -append "panic=1 loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
-+        -append "panic=1 systemd.crash_reboot loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
-         -initrd "$TESTDIR"/initramfs.server \
-         -pidfile "$TESTDIR"/server.pid -daemonize || return 1
- 
-@@ -63,7 +63,7 @@ client_test() {
-                       -device e1000,netdev=n2,mac=52:54:00:12:34:99 \
-                       -watchdog i6300esb -watchdog-action poweroff \
-                       -no-reboot \
--                      -append "panic=1 rd.shell=0 $cmdline $DEBUGFAIL rd.retry=5 ro console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console loglevel=7" \
-+                      -append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.retry=5 ro console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console loglevel=7" \
-                       -initrd "$TESTDIR"/initramfs.testing
- 
-     { read OK; read IFACES; } < "$TESTDIR"/client.img
-diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
-index 8c11a7d3..5618baee 100755
---- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
-+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
-@@ -31,7 +31,7 @@ run_server() {
-         ${SERIAL:--serial file:"$TESTDIR"/server.log} \
-         -watchdog i6300esb -watchdog-action poweroff \
-         -no-reboot \
--        -append "panic=1 loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 rd.debug" \
-+        -append "panic=1 systemd.crash_reboot loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 rd.debug" \
-         -initrd "$TESTDIR"/initramfs.server \
-         -pidfile "$TESTDIR"/server.pid -daemonize || return 1
-     chmod 644 -- "$TESTDIR"/server.pid || return 1
-@@ -79,7 +79,7 @@ client_test() {
-             $nic3 -device e1000,mac=52:54:00:12:34:05,netdev=n3 \
-             -watchdog i6300esb -watchdog-action poweroff \
-             -no-reboot \
--            -append "panic=1 $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
-+            -append "panic=1 systemd.crash_reboot $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
-             -initrd "$TESTDIR"/initramfs.testing
-     else
-         $testdir/run-qemu \
-@@ -95,7 +95,7 @@ client_test() {
-             -net nic,vlan=3,macaddr=52:54:00:12:34:05,model=e1000 \
-             -watchdog i6300esb -watchdog-action poweroff \
-             -no-reboot \
--            -append "panic=1 $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
-+            -append "panic=1 systemd.crash_reboot $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
-             -initrd "$TESTDIR"/initramfs.testing
-     fi
- 
-

SOURCES/0034.patch

@@ -1,229 +0,0 @@
-From a34b1baa6ca45b420399ec4cefe3cfe225c14dcf Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Tue, 11 Jun 2019 09:56:13 +0200
-Subject: [PATCH] test/{10,12,13,14,17,30,31}: increase the disk sizes
-
-On Fedora 30 the paritition sizes turn out to be too small again:
-
-  + mkdir -p /sysroot
-  + mount /dev/dracut/root /sysroot
-  + cp -a -t /sysroot /source/bin /source/dev /source/etc /source/lib /source/lib64 /source/proc /source/root /source/sbin /source/sys /source/tmp /source/usr /source/var
-  cp: error writing '/sysroot/usr/lib64/libkrb5.so.3.3': No space left on device
-  cp: error writing '/sysroot/usr/lib64/libkrb5support.so.0.1': No space left on device
-
-It turns out that there has been quite some size increase in some libraries,
-notably glibc, though not all -- some even shrunk, ruling out a toolchain
-problem. Here's are files over 1M we install on Fedora 30:
-
-   f29    f30
-  2.7M => 6.4M /usr/lib64/{libc-2.28.so => libc-2.29.so}
-  3.1M => 6.0M /usr/lib64/libcrypto.so.1.1.1c
-  2.0M => 3.5M /usr/lib64/{libm-2.28.so => libm-2.29.so}
-  2.9M => 2.8M /usr/lib/systemd/{libsystemd-shared-239.so => libsystemd-shared-241.so}
-  1.7M => 2.5M /usr/lib64/libunistring.so.2.1.0
-  2.3M => 2.4M /usr/lib64/bind9-export/libdns-export.so.1105.0.0
-  1.2M => 2.1M /usr/bin/bash
-  1.1M => 1.4M /usr/lib64/libkrb5.so.3.3
-  1.2M => 1.4M /usr/lib64/libgcrypt.so.20.2.4
-  612K => 1.1M /usr/lib64/libssl.so.1.1.1c
-
-This increases the image sizes to accomodate for this. There's probably
-little else we can do.
-
-(cherry picked from commit e318ba30fbd84d510a5bbb071d868e523d965869)
----
- test/TEST-10-RAID/create-root.sh         | 6 +++---
- test/TEST-10-RAID/test.sh                | 2 +-
- test/TEST-12-RAID-DEG/test.sh            | 6 +++---
- test/TEST-13-ENC-RAID-LVM/create-root.sh | 6 +++---
- test/TEST-13-ENC-RAID-LVM/test.sh        | 2 +-
- test/TEST-14-IMSM/create-root.sh         | 6 +++---
- test/TEST-14-IMSM/test.sh                | 4 ++--
- test/TEST-17-LVM-THIN/create-root.sh     | 8 ++++----
- test/TEST-17-LVM-THIN/test.sh            | 2 +-
- test/TEST-30-ISCSI/test.sh               | 6 +++---
- test/TEST-31-ISCSI-MULTI/test.sh         | 6 +++---
- 11 files changed, 27 insertions(+), 27 deletions(-)
-
-diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
-index 7b5f2a76..af4cac0d 100755
---- a/test/TEST-10-RAID/create-root.sh
-+++ b/test/TEST-10-RAID/create-root.sh
-@@ -8,9 +8,9 @@ udevadm control --reload
- # save a partition at the beginning for future flagging purposes
- sfdisk /dev/sda <<EOF
- ,4M
--,25M
--,25M
--,25M
-+,41M
-+,41M
-+,41M
- EOF
- udevadm settle
- mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /dev/sda3 /dev/sda4
-diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
-index 0beb26c3..07179a29 100755
---- a/test/TEST-10-RAID/test.sh
-+++ b/test/TEST-10-RAID/test.sh
-@@ -22,7 +22,7 @@ test_setup() {
-     DISKIMAGE=$TESTDIR/TEST-10-RAID-root.img
-     # Create the blank file to use as a root filesystem
-     rm -f -- $DISKIMAGE
--    dd if=/dev/null of=$DISKIMAGE bs=1M seek=80
-+    dd if=/dev/null of=$DISKIMAGE bs=1M seek=128
- 
-     kernel=$KVERSION
-     # Create what will eventually be our root filesystem onto an overlay
-diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
-index c82cde1e..920baafd 100755
---- a/test/TEST-12-RAID-DEG/test.sh
-+++ b/test/TEST-12-RAID-DEG/test.sh
-@@ -59,9 +59,9 @@ test_setup() {
-     # Create the blank file to use as a root filesystem
-     rm -f -- $TESTDIR/root.ext2
-     dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=40
--    dd if=/dev/null of=$TESTDIR/disk1.img bs=1M seek=20
--    dd if=/dev/null of=$TESTDIR/disk2.img bs=1M seek=20
--    dd if=/dev/null of=$TESTDIR/disk3.img bs=1M seek=20
-+    dd if=/dev/null of=$TESTDIR/disk1.img bs=1M seek=35
-+    dd if=/dev/null of=$TESTDIR/disk2.img bs=1M seek=35
-+    dd if=/dev/null of=$TESTDIR/disk3.img bs=1M seek=35
- 
-     kernel=$KVERSION
-     # Create what will eventually be our root filesystem onto an overlay
-diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
-index 72bc765f..13e65838 100755
---- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
-+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
-@@ -9,9 +9,9 @@ udevadm control --reload
- # save a partition at the beginning for future flagging purposes
- sfdisk /dev/sda <<EOF
- ,4M
--,25M
--,25M
--,25M
-+,43M
-+,43M
-+,43M
- EOF
- udevadm settle
- printf test >keyfile
-diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
-index 99324ce9..9ffe24b1 100755
---- a/test/TEST-13-ENC-RAID-LVM/test.sh
-+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
-@@ -59,7 +59,7 @@ test_run() {
- test_setup() {
-     # Create the blank file to use as a root filesystem
-     rm -f -- $TESTDIR/root.ext2
--    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=80
-+    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=134
- 
-     kernel=$KVERSION
-     # Create what will eventually be our root filesystem onto an overlay
-diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh
-index a0324c6f..0d10945b 100755
---- a/test/TEST-14-IMSM/create-root.sh
-+++ b/test/TEST-14-IMSM/create-root.sh
-@@ -32,9 +32,9 @@ sfdisk -g /dev/mapper/isw*Test0
- # save a partition at the beginning for future flagging purposes
- sfdisk --no-reread /dev/mapper/isw*Test0 <<EOF
- ,4M
--,20M
--,20M
--,20M
-+,28M
-+,28M
-+,28M
- EOF
- 
- udevadm settle
-diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
-index ed60f052..a3e52b53 100755
---- a/test/TEST-14-IMSM/test.sh
-+++ b/test/TEST-14-IMSM/test.sh
-@@ -53,8 +53,8 @@ test_setup() {
-     rm -f -- $TESTDIR/disk1
-     rm -f -- $TESTDIR/disk2
-     dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=1
--    dd if=/dev/null of=$TESTDIR/disk1 bs=1M seek=80
--    dd if=/dev/null of=$TESTDIR/disk2 bs=1M seek=80
-+    dd if=/dev/null of=$TESTDIR/disk1 bs=1M seek=104
-+    dd if=/dev/null of=$TESTDIR/disk2 bs=1M seek=104
- 
-     kernel=$KVERSION
-     # Create what will eventually be our root filesystem onto an overlay
-diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh
-index 0e52f879..6e09012e 100755
---- a/test/TEST-17-LVM-THIN/create-root.sh
-+++ b/test/TEST-17-LVM-THIN/create-root.sh
-@@ -8,16 +8,16 @@ udevadm control --reload
- # save a partition at the beginning for future flagging purposes
- sfdisk /dev/sda <<EOF
- ,4M
--,25M
--,25M
--,25M
-+,29M
-+,29M
-+,29M
- EOF
- udevadm settle
- for i in sda2 sda3 sda4; do
- lvm pvcreate -ff  -y /dev/$i ;
- done && \
- lvm vgcreate dracut /dev/sda[234] && \
--lvm lvcreate -l 16  -T dracut/mythinpool && \
-+lvm lvcreate -l 17  -T dracut/mythinpool && \
- lvm lvcreate -V1G -T dracut/mythinpool -n root && \
- lvm vgchange -ay && \
- mke2fs /dev/dracut/root && \
-diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
-index c13e9063..c7247c91 100755
---- a/test/TEST-17-LVM-THIN/test.sh
-+++ b/test/TEST-17-LVM-THIN/test.sh
-@@ -19,7 +19,7 @@ test_run() {
- 
- test_setup() {
-     # Create the blank file to use as a root filesystem
--    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=80
-+    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=92
- 
-     kernel=$KVERSION
-     # Create what will eventually be our root filesystem onto an overlay
-diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
-index d5a6ba58..c126e3dd 100755
---- a/test/TEST-30-ISCSI/test.sh
-+++ b/test/TEST-30-ISCSI/test.sh
-@@ -109,9 +109,9 @@ test_setup() {
-     fi
- 
-     # Create the blank file to use as a root filesystem
--    dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=40
--    dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=40
--    dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=40
-+    dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=45
-+    dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=45
-+    dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=45
- 
-     kernel=$KVERSION
-     # Create what will eventually be our root filesystem onto an overlay
-diff --git a/test/TEST-31-ISCSI-MULTI/test.sh b/test/TEST-31-ISCSI-MULTI/test.sh
-index 20db2451..122c69e3 100755
---- a/test/TEST-31-ISCSI-MULTI/test.sh
-+++ b/test/TEST-31-ISCSI-MULTI/test.sh
-@@ -131,9 +131,9 @@ test_setup() {
-     fi
- 
-     # Create the blank file to use as a root filesystem
--    dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=40
--    dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=40
--    dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=40
-+    dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=45
-+    dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=45
-+    dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=45
- 
-     kernel=$KVERSION
-     # Create what will eventually be our root filesystem onto an overlay
-

SOURCES/0035.patch

@@ -1,27 +0,0 @@
-From d9bf0c38be49199724abe1d18bc1c2686e6f0c88 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Thu, 27 Jun 2019 16:20:32 +0200
-Subject: [PATCH] travis: run TEST-14-IMSM on Fedora 29
-
-Systemd in Fedora 30 is broken at the moment.
-Fix: https://github.com/systemd/systemd/pull/12872/
-
-(cherry picked from commit 7a2503ab8cec9473ad6dacf4f48b17344219f3c0)
----
- .travis.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index efb0df1b..de0af438 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -19,7 +19,7 @@ env:
-   - IMAGE=latest TESTS=10
-   - IMAGE=latest TESTS=11
-   - IMAGE=latest TESTS=13
--  - IMAGE=latest TESTS=14
-+  - IMAGE=29 TESTS=14
-   - IMAGE=latest TESTS=15
-   - IMAGE=latest TESTS=17
- 
-

SOURCES/0036.patch

@@ -1,27 +0,0 @@
-From c60f4fc027272c221a887128070ac89547b6ecc3 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Thu, 27 Jun 2019 16:22:04 +0200
-Subject: [PATCH] travis: run TEST-13-ENC-RAID-LVM on Fedora 29
-
-Systemd in Fedora 30 is broken at the moment.
-Fix: https://github.com/systemd/systemd/pull/12897
-
-(cherry picked from commit 8238f41b34777c3c75b03a9b598d4b9e1c7bf911)
----
- .travis.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index de0af438..364078cf 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -18,7 +18,7 @@ env:
-   - IMAGE=latest TESTS=04
-   - IMAGE=latest TESTS=10
-   - IMAGE=latest TESTS=11
--  - IMAGE=latest TESTS=13
-+  - IMAGE=29 TESTS=13
-   - IMAGE=29 TESTS=14
-   - IMAGE=latest TESTS=15
-   - IMAGE=latest TESTS=17
-

SOURCES/0037.patch

@@ -1,53 +0,0 @@
-From d8f0e52ac7d05c364ca24d2058c970e5e03f82ff Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Fri, 30 Aug 2019 16:16:51 +0200
-Subject: [PATCH] all: remove debugging leftovers
-
-Accidentally folded into commit e671c3a06a7e5 ('95iscsi/module-setup.sh:
-do not require 'hostname' anymore').
----
- modules.d/40network/netroot.sh               | 2 +-
- modules.d/98dracut-systemd/dracut-cmdline.sh | 2 +-
- modules.d/99base/init.sh                     | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/40network/netroot.sh b/modules.d/40network/netroot.sh
-index 654cfc72..207364cd 100755
---- a/modules.d/40network/netroot.sh
-+++ b/modules.d/40network/netroot.sh
-@@ -66,7 +66,7 @@ if [ -z "$2" ]; then
- 
-     # Check: do we really know how to handle (net)root?
-     [ -z "$root" ] && die "No or empty root= argument"
--    [ -z "$rootok" ] && die "X2 Don't know how to handle 'root=$root'"
-+    [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
- 
-     handler=${netroot%%:*}
-     handler=${handler%%4}
-diff --git a/modules.d/98dracut-systemd/dracut-cmdline.sh b/modules.d/98dracut-systemd/dracut-cmdline.sh
-index 89c52d13..bff9435a 100755
---- a/modules.d/98dracut-systemd/dracut-cmdline.sh
-+++ b/modules.d/98dracut-systemd/dracut-cmdline.sh
-@@ -76,7 +76,7 @@ case "${root}${root_unset}" in
- esac
- 
- [ -z "${root}${root_unset}" ] && die "Empty root= argument"
--[ -z "$rootok" ] && die "X1 Don't know how to handle 'root=$root'"
-+[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
- 
- export root rflags fstype netroot NEWROOT
- 
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 3e20069f..e4f7cff1 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -136,7 +136,7 @@ getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Br
- source_hook cmdline
- 
- [ -z "$root" ] && die "No or empty root= argument"
--[ -z "$rootok" ] && die "X0 Don't know how to handle 'root=$root'"
-+[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
- 
- export root rflags fstype netroot NEWROOT
- 
-

SOURCES/0038.patch

@@ -1,31 +0,0 @@
-From 8eb08e55286e77f005246d1db1bfd2adf4a0e40b Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Tue, 27 Nov 2018 15:30:48 +0100
-Subject: [PATCH] network-manager: call the online hook for connected devices
-
-Look for "connection-uuid" instead of "managed" to determine the devices
-that are actually activated with a connection and call the online hook.
-
-This fixes the anaconda-net root mount, which utilizes the online hook.
-
-(cherry picked from commit 79a17b0112995eb60c85c64d15070c52f213b28d)
----
- modules.d/35network-manager/nm-run.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
-index f6defa99..0f943631 100755
---- a/modules.d/35network-manager/nm-run.sh
-+++ b/modules.d/35network-manager/nm-run.sh
-@@ -9,8 +9,9 @@ fi
- for _i in /sys/class/net/*/
- do
-     state=/run/NetworkManager/devices/$(cat $_i/ifindex)
--    grep -q managed=true $state 2>/dev/null || continue
-+    grep -q connection-uuid= $state 2>/dev/null || continue
-     ifname=$(basename $_i)
-     sed -n 's/root-path/new_root_path/p' <$state >/tmp/dhclient.$ifname.dhcpopts
-+    source_hook initqueue/online $ifname
-     /sbin/netroot $ifname
- done
-

SOURCES/0039.patch

@@ -1,24 +0,0 @@
-From 34011ee53e745f74d70bc5b52dade6d4ef349e90 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 17 Jun 2019 10:07:38 +0200
-Subject: [PATCH] network-manager: remove useless use of basename
-
-(cherry picked from commit 5e0f8c8a4ced36268d0077acafa1db2402776fa6)
----
- modules.d/35network-manager/nm-run.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
-index 0f943631..5f4b38ca 100755
---- a/modules.d/35network-manager/nm-run.sh
-+++ b/modules.d/35network-manager/nm-run.sh
-@@ -10,7 +10,7 @@ for _i in /sys/class/net/*/
- do
-     state=/run/NetworkManager/devices/$(cat $_i/ifindex)
-     grep -q connection-uuid= $state 2>/dev/null || continue
--    ifname=$(basename $_i)
-+    ifname=${_i##*/}
-     sed -n 's/root-path/new_root_path/p' <$state >/tmp/dhclient.$ifname.dhcpopts
-     source_hook initqueue/online $ifname
-     /sbin/netroot $ifname
-

SOURCES/0040.patch

@@ -1,24 +0,0 @@
-From 94c75a2a827ff09ffac18454d5c4ba4756d721d6 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 27 May 2019 12:44:17 +0200
-Subject: [PATCH] network-manager: also read out next-server from NM state
-
-(cherry picked from commit 4be95b67a73e7434f92a7d7c40955eae0b59717e)
----
- modules.d/35network-manager/nm-run.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh
-index 5f4b38ca..a539d5b2 100755
---- a/modules.d/35network-manager/nm-run.sh
-+++ b/modules.d/35network-manager/nm-run.sh
-@@ -11,7 +11,7 @@ do
-     state=/run/NetworkManager/devices/$(cat $_i/ifindex)
-     grep -q connection-uuid= $state 2>/dev/null || continue
-     ifname=${_i##*/}
--    sed -n 's/root-path/new_root_path/p' <$state >/tmp/dhclient.$ifname.dhcpopts
-+    sed -n 's/root-path/new_root_path/p;s/next-server/new_next_server/p' <$state >/tmp/dhclient.$ifname.dhcpopts
-     source_hook initqueue/online $ifname
-     /sbin/netroot $ifname
- done
-

SOURCES/0041.patch

@@ -1,30 +0,0 @@
-From 68fefe6f9424d3f29e6da9133579c385e7b470b2 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 27 May 2019 12:43:59 +0200
-Subject: [PATCH] network-manager: generate configuration with netroot=
-
-If the root is on network, let nm-initrd-generator create configuration
-even if none was explicitly specified on the command line.
-
-Also do the same if /tmp/net.ifaces exists, because the anaconda plugin
-creates an empty file in that location in hopes that will make us
-configure the network.
-
-(cherry picked from commit 381ab6b7cd2d35bf7f9da63b10c20f5ef6e61a8b)
----
- modules.d/35network-manager/nm-config.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules.d/35network-manager/nm-config.sh b/modules.d/35network-manager/nm-config.sh
-index 1339ebe7..1efa737c 100755
---- a/modules.d/35network-manager/nm-config.sh
-+++ b/modules.d/35network-manager/nm-config.sh
-@@ -1,3 +1,7 @@
- #!/bin/sh
- 
-+if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
-+    echo rd.neednet >> /etc/cmdline.d/35-neednet.conf
-+fi
-+
- /usr/libexec/nm-initrd-generator -- $(getcmdline)
-

SOURCES/0042.patch

@@ -1,43 +0,0 @@
-From 53cece208a44c53ecc001cb8eb769f6fb9b3d1dc Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 27 May 2019 11:12:22 +0200
-Subject: [PATCH] network: parse root=dhcp also with network-manager module
-
-Move the logic from network-legacy to common network code.
-
-(cherry picked from commit 35efada5ecffd139660b4a89f4cc3d627752c91e)
----
- modules.d/35network-legacy/module-setup.sh             | 1 -
- modules.d/{35network-legacy => 40network}/dhcp-root.sh | 0
- modules.d/40network/module-setup.sh                    | 1 +
- 3 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/35network-legacy/module-setup.sh b/modules.d/35network-legacy/module-setup.sh
-index 71abda36..5a82e998 100755
---- a/modules.d/35network-legacy/module-setup.sh
-+++ b/modules.d/35network-legacy/module-setup.sh
-@@ -36,7 +36,6 @@ install() {
-     inst_simple -H "/etc/dhclient.conf"
-     cat "$moddir/dhclient.conf" >> "${initdir}/etc/dhclient.conf"
-     inst_hook pre-udev 60 "$moddir/net-genrules.sh"
--    inst_hook cmdline 91 "$moddir/dhcp-root.sh"
-     inst_hook cmdline 92 "$moddir/parse-ibft.sh"
-     inst_hook cmdline 95 "$moddir/parse-vlan.sh"
-     inst_hook cmdline 96 "$moddir/parse-bond.sh"
-diff --git a/modules.d/35network-legacy/dhcp-root.sh b/modules.d/40network/dhcp-root.sh
-similarity index 100%
-rename from modules.d/35network-legacy/dhcp-root.sh
-rename to modules.d/40network/dhcp-root.sh
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index e8541636..8e2a74a3 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -28,6 +28,7 @@ install() {
-     inst_script "$moddir/netroot.sh" "/sbin/netroot"
-     inst_simple "$moddir/net-lib.sh" "/lib/net-lib.sh"
-     inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
-+    inst_hook cmdline 91 "$moddir/dhcp-root.sh"
- 
-     dracut_need_initqueue
- }
-

SOURCES/0043.patch

@@ -1,620 +0,0 @@
-From 4e10601254bb20891dc2919416d7151583678c3d Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 10 Jun 2019 16:04:18 +0200
-Subject: [PATCH] test: copy BONDBRIDGETEAMVLAN to IFCFG
-
-The IFCFG test will make sure the network-legacy plugin keeps writing
-out correct ifcfg files.
-
-This is a separate commit so that actual changes are visible in the
-following one.
-
-(cherry picked from commit 70787ab61957741a05e4046bad49758c4e9bc1cc)
----
- test/TEST-60-IFCFG/99-idesymlinks.rules |   8 +
- test/TEST-60-IFCFG/Makefile             |  10 +
- test/TEST-60-IFCFG/client-init.sh       |  22 +++
- test/TEST-60-IFCFG/dhcpd.conf           |  27 +++
- test/TEST-60-IFCFG/exports              |   1 +
- test/TEST-60-IFCFG/finished-false.sh    |   2 +
- test/TEST-60-IFCFG/hard-off.sh          |   3 +
- test/TEST-60-IFCFG/hosts                |   5 +
- test/TEST-60-IFCFG/server-init.sh       | 120 ++++++++++++
- test/TEST-60-IFCFG/test.sh              | 336 ++++++++++++++++++++++++++++++++
- 10 files changed, 534 insertions(+)
-
-diff --git a/test/TEST-60-IFCFG/99-idesymlinks.rules b/test/TEST-60-IFCFG/99-idesymlinks.rules
-new file mode 100644
-index 00000000..d557790a
---- /dev/null
-+++ b/test/TEST-60-IFCFG/99-idesymlinks.rules
-@@ -0,0 +1,8 @@
-+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="hda", SYMLINK+="sda"
-+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", KERNEL=="hda*", SYMLINK+="sda$env{MINOR}"
-+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="hdb", SYMLINK+="sdb"
-+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", KERNEL=="hdb*", SYMLINK+="sdb$env{MINOR}"
-+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="hdc", SYMLINK+="sdc"
-+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", KERNEL=="hdc*", SYMLINK+="sdc$env{MINOR}"
-+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="hdd", SYMLINK+="sdd"
-+ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", KERNEL=="hdd*", SYMLINK+="sdd$env{MINOR}"
-diff --git a/test/TEST-60-IFCFG/Makefile b/test/TEST-60-IFCFG/Makefile
-new file mode 100644
-index 00000000..aad27059
---- /dev/null
-+++ b/test/TEST-60-IFCFG/Makefile
-@@ -0,0 +1,10 @@
-+all:
-+	@$(MAKE) -s --no-print-directory -C ../.. all
-+	@V=$(V) basedir=../.. testdir=../ ./test.sh --all
-+setup:
-+	@$(MAKE) --no-print-directory -C ../.. all
-+	@basedir=../.. testdir=../ ./test.sh --setup
-+clean:
-+	@basedir=../.. testdir=../ ./test.sh --clean
-+run:
-+	@basedir=../.. testdir=../ ./test.sh --run
-diff --git a/test/TEST-60-IFCFG/client-init.sh b/test/TEST-60-IFCFG/client-init.sh
-new file mode 100755
-index 00000000..8c33ff0f
---- /dev/null
-+++ b/test/TEST-60-IFCFG/client-init.sh
-@@ -0,0 +1,22 @@
-+#!/bin/sh
-+exec >/dev/console 2>&1
-+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-+strstr() { [ "${1#*$2*}" != "$1" ]; }
-+CMDLINE=$(while read line; do echo $line;done < /proc/cmdline)
-+export TERM=linux
-+export PS1='initramfs-test:\w\$ '
-+stty sane
-+echo "made it to the rootfs! Powering down."
-+
-+(
-+    echo OK
-+    ip -o -4 address show scope global | while read n if rest; do echo $if;done | sort
-+    for i in /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-*; do
-+	echo $i
-+	grep -v 'UUID=' $i
-+    done
-+    echo EOF
-+) > /dev/sda
-+
-+strstr "$CMDLINE" "rd.shell" && sh -i
-+poweroff -f
-diff --git a/test/TEST-60-IFCFG/dhcpd.conf b/test/TEST-60-IFCFG/dhcpd.conf
-new file mode 100644
-index 00000000..e26bd60b
---- /dev/null
-+++ b/test/TEST-60-IFCFG/dhcpd.conf
-@@ -0,0 +1,27 @@
-+ddns-update-style none;
-+
-+use-host-decl-names true;
-+
-+subnet 192.168.50.0 netmask 255.255.255.0 {
-+	option subnet-mask      255.255.255.0;
-+	option routers          192.168.50.1;
-+	next-server             192.168.50.1;
-+	server-identifier       192.168.50.1;
-+	option domain-name-servers 192.168.50.1;
-+	option domain-search "example.com";
-+	option domain-name "other.com";
-+	option root-path "nfs:192.168.50.1:/nfs/client";
-+	range 192.168.50.10 192.168.50.100;
-+}
-+
-+subnet 192.168.51.0 netmask 255.255.255.0 {
-+	option subnet-mask      255.255.255.0;
-+	option routers          192.168.51.1;
-+	next-server             192.168.51.1;
-+	server-identifier       192.168.51.1;
-+	option domain-name-servers 192.168.51.1;
-+	option domain-search "example.com";
-+	option domain-name "other.com";
-+	option root-path "nfs:192.168.51.1:/nfs/client";
-+	range 192.168.51.10 192.168.51.100;
-+}
-diff --git a/test/TEST-60-IFCFG/exports b/test/TEST-60-IFCFG/exports
-new file mode 100644
-index 00000000..ff5f29b1
---- /dev/null
-+++ b/test/TEST-60-IFCFG/exports
-@@ -0,0 +1 @@
-+/nfs/client	192.168.50.0/24(rw,insecure,no_subtree_check,no_root_squash)
-diff --git a/test/TEST-60-IFCFG/finished-false.sh b/test/TEST-60-IFCFG/finished-false.sh
-new file mode 100755
-index 00000000..ecdbef95
---- /dev/null
-+++ b/test/TEST-60-IFCFG/finished-false.sh
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+exit 1
-diff --git a/test/TEST-60-IFCFG/hard-off.sh b/test/TEST-60-IFCFG/hard-off.sh
-new file mode 100755
-index 00000000..12c3d5ac
---- /dev/null
-+++ b/test/TEST-60-IFCFG/hard-off.sh
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+getarg rd.shell || poweroff -f
-+getarg failme && poweroff -f
-diff --git a/test/TEST-60-IFCFG/hosts b/test/TEST-60-IFCFG/hosts
-new file mode 100644
-index 00000000..d02a4e9b
---- /dev/null
-+++ b/test/TEST-60-IFCFG/hosts
-@@ -0,0 +1,5 @@
-+127.0.0.1	localhost
-+192.168.50.1	server
-+192.168.50.100	client-if1
-+192.168.50.101	client-if2
-+192.168.50.102	client-if3
-diff --git a/test/TEST-60-IFCFG/server-init.sh b/test/TEST-60-IFCFG/server-init.sh
-new file mode 100755
-index 00000000..b9f01c9b
---- /dev/null
-+++ b/test/TEST-60-IFCFG/server-init.sh
-@@ -0,0 +1,120 @@
-+#!/bin/sh
-+exec </dev/console >/dev/console 2>&1
-+set -x
-+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-+export TERM=linux
-+export PS1='nfstest-server:\w\$ '
-+stty sane
-+echo "made it to the rootfs!"
-+echo server > /proc/sys/kernel/hostname
-+
-+wait_for_if_link() {
-+    local cnt=0
-+    local li
-+    while [ $cnt -lt 600 ]; do
-+        li=$(ip -o link show dev $1 2>/dev/null)
-+        [ -n "$li" ] && return 0
-+        sleep 0.1
-+        cnt=$(($cnt+1))
-+    done
-+    return 1
-+}
-+
-+wait_for_if_up() {
-+    local cnt=0
-+    local li
-+    while [ $cnt -lt 200 ]; do
-+        li=$(ip -o link show up dev $1)
-+        [ -n "$li" ] && return 0
-+        sleep 0.1
-+        cnt=$(($cnt+1))
-+    done
-+    return 1
-+}
-+
-+wait_for_route_ok() {
-+    local cnt=0
-+    while [ $cnt -lt 200 ]; do
-+        li=$(ip route show)
-+        [ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
-+        sleep 0.1
-+        cnt=$(($cnt+1))
-+    done
-+    return 1
-+}
-+
-+linkup() {
-+    wait_for_if_link $1 2>/dev/null\
-+     && ip link set $1 up 2>/dev/null\
-+     && wait_for_if_up $1 2>/dev/null
-+}
-+
-+modprobe --all -b -q 8021q ipvlan macvlan
-+>/dev/watchdog
-+ip addr add 127.0.0.1/8 dev lo
-+linkup lo
-+ip link set dev eth0 name ens3
-+ip addr add 192.168.50.1/24 dev ens3
-+linkup ens3
-+>/dev/watchdog
-+ip link set dev eth1 name ens4
-+ip link add dev ens4.1 link ens4 type vlan id 1
-+ip link add dev ens4.2 link ens4 type vlan id 2
-+ip link add dev ens4.3 link ens4 type vlan id 3
-+ip link add dev ens4.4 link ens4 type vlan id 4
-+ip addr add 192.168.54.1/24 dev ens4.1
-+ip addr add 192.168.55.1/24 dev ens4.2
-+ip addr add 192.168.56.1/24 dev ens4.3
-+ip addr add 192.168.57.1/24 dev ens4.4
-+linkup ens4
-+ip link set dev ens4.1 up
-+ip link set dev ens4.2 up
-+ip link set dev ens4.3 up
-+ip link set dev ens4.4 up
-+ip link set dev eth2 name ens5
-+ip addr add 192.168.51.1/24 dev ens5
-+linkup ens5
-+ip link set dev eth3 name ens6
-+linkup ens6
-+>/dev/watchdog
-+modprobe af_packet
-+> /dev/watchdog
-+modprobe sunrpc
-+>/dev/watchdog
-+mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs
-+>/dev/watchdog
-+[ -x /sbin/portmap ] && portmap
-+>/dev/watchdog
-+mkdir -p /run/rpcbind
-+[ -x /sbin/rpcbind ] && rpcbind
-+>/dev/watchdog
-+modprobe nfsd
-+>/dev/watchdog
-+mount -t nfsd nfsd /proc/fs/nfsd
-+>/dev/watchdog
-+exportfs -r
-+>/dev/watchdog
-+rpc.nfsd
-+>/dev/watchdog
-+rpc.mountd
-+>/dev/watchdog
-+rpc.idmapd
-+>/dev/watchdog
-+exportfs -r
-+>/dev/watchdog
-+>/var/lib/dhcpd/dhcpd.leases
-+>/dev/watchdog
-+chmod 777 /var/lib/dhcpd/dhcpd.leases
-+>/dev/watchdog
-+dhcpd -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases ens3 ens5
-+#echo -n 'V' > /dev/watchdog
-+#sh -i
-+#tcpdump -i ens3
-+# Wait forever for the VM to die
-+echo "Serving NFS mounts"
-+while :; do
-+	sleep 10
-+	>/dev/watchdog
-+done
-+mount -n -o remount,ro /
-+poweroff -f
-diff --git a/test/TEST-60-IFCFG/test.sh b/test/TEST-60-IFCFG/test.sh
-new file mode 100755
-index 00000000..8c11a7d3
---- /dev/null
-+++ b/test/TEST-60-IFCFG/test.sh
-@@ -0,0 +1,336 @@
-+#!/bin/bash
-+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-+# ex: ts=8 sw=4 sts=4 et filetype=sh
-+TEST_DESCRIPTION="root filesystem on NFS with bridging/bonding/vlan"
-+KVERSION=${KVERSION-$(uname -r)}
-+
-+# Uncomment this to debug failures
-+#DEBUGFAIL="rd.shell rd.break"
-+#DEBUGFAIL="rd.shell rd.break rd.debug"
-+#SERIAL="tcp:127.0.0.1:9999"
-+
-+run_server() {
-+    # Start server first
-+    echo "MULTINIC TEST SETUP: Starting DHCP/NFS server"
-+
-+    fsck -a "$TESTDIR"/server.ext3 || return 1
-+
-+    $testdir/run-qemu \
-+        -hda "$TESTDIR"/server.ext3 \
-+        -m 512M -smp 2 \
-+        -display none \
-+        -netdev socket,id=n0,listen=127.0.0.1:12370 \
-+        -netdev socket,id=n1,listen=127.0.0.1:12371 \
-+        -netdev socket,id=n2,listen=127.0.0.1:12372 \
-+        -netdev socket,id=n3,listen=127.0.0.1:12373 \
-+        -device e1000,netdev=n0,mac=52:54:01:12:34:56 \
-+        -device e1000,netdev=n1,mac=52:54:01:12:34:57 \
-+        -device e1000,netdev=n2,mac=52:54:01:12:34:58 \
-+        -device e1000,netdev=n3,mac=52:54:01:12:34:59 \
-+        ${SERIAL:+-serial "$SERIAL"} \
-+        ${SERIAL:--serial file:"$TESTDIR"/server.log} \
-+        -watchdog i6300esb -watchdog-action poweroff \
-+        -no-reboot \
-+        -append "panic=1 loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 rd.debug" \
-+        -initrd "$TESTDIR"/initramfs.server \
-+        -pidfile "$TESTDIR"/server.pid -daemonize || return 1
-+    chmod 644 -- "$TESTDIR"/server.pid || return 1
-+
-+    # Cleanup the terminal if we have one
-+    tty -s && stty sane
-+
-+    echo Sleeping 10 seconds to give the server a head start
-+    sleep 10
-+}
-+
-+client_test() {
-+    local test_name="$1"
-+    local do_vlan13="$2"
-+    local cmdline="$3"
-+    local check="$4"
-+    local CONF
-+
-+    echo "CLIENT TEST START: $test_name"
-+
-+    [ "$do_vlan13" != "yes" ] && unset do_vlan13
-+
-+    # Need this so kvm-qemu will boot (needs non-/dev/zero local disk)
-+    if ! dd if=/dev/zero of="$TESTDIR"/client.img bs=1M count=1; then
-+        echo "Unable to make client sda image" 1>&2
-+        return 1
-+    fi
-+    if [[ $do_vlan13 ]]; then
-+        nic1=" -netdev socket,connect=127.0.0.1:12371,id=n1"
-+        nic3=" -netdev socket,connect=127.0.0.1:12373,id=n3"
-+    else
-+        nic1=" -netdev hubport,id=n1,hubid=2"
-+        nic3=" -netdev hubport,id=n3,hubid=3"
-+    fi
-+
-+    if $testdir/run-qemu --help | grep -qF -m1 'netdev hubport,id=str,hubid=n[,netdev=nd]' && echo OK; then
-+        $testdir/run-qemu \
-+            -hda "$TESTDIR"/client.img -m 512M -smp 2 -nographic \
-+            -netdev socket,connect=127.0.0.1:12370,id=s1 \
-+            -netdev hubport,hubid=1,id=h1,netdev=s1 \
-+            -netdev hubport,hubid=1,id=h2 -device e1000,mac=52:54:00:12:34:01,netdev=h2 \
-+            -netdev hubport,hubid=1,id=h3 -device e1000,mac=52:54:00:12:34:02,netdev=h3 \
-+            $nic1 -device e1000,mac=52:54:00:12:34:03,netdev=n1  \
-+            -netdev socket,connect=127.0.0.1:12372,id=n2 -device e1000,mac=52:54:00:12:34:04,netdev=n2 \
-+            $nic3 -device e1000,mac=52:54:00:12:34:05,netdev=n3 \
-+            -watchdog i6300esb -watchdog-action poweroff \
-+            -no-reboot \
-+            -append "panic=1 $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
-+            -initrd "$TESTDIR"/initramfs.testing
-+    else
-+        $testdir/run-qemu \
-+            -hda "$TESTDIR"/client.img -m 512M -smp 2 -nographic \
-+            -net socket,vlan=0,connect=127.0.0.1:12370 \
-+            ${do_vlan13:+-net socket,vlan=1,connect=127.0.0.1:12371} \
-+            -net socket,vlan=2,connect=127.0.0.1:12372 \
-+            ${do_vlan13:+-net socket,vlan=3,connect=127.0.0.1:12373} \
-+            -net nic,vlan=0,macaddr=52:54:00:12:34:01,model=e1000 \
-+            -net nic,vlan=0,macaddr=52:54:00:12:34:02,model=e1000 \
-+            -net nic,vlan=1,macaddr=52:54:00:12:34:03,model=e1000 \
-+            -net nic,vlan=2,macaddr=52:54:00:12:34:04,model=e1000 \
-+            -net nic,vlan=3,macaddr=52:54:00:12:34:05,model=e1000 \
-+            -watchdog i6300esb -watchdog-action poweroff \
-+            -no-reboot \
-+            -append "panic=1 $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
-+            -initrd "$TESTDIR"/initramfs.testing
-+    fi
-+
-+    { 
-+        read OK
-+        if [[ "$OK" != "OK" ]]; then
-+            echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
-+            return 1
-+        fi
-+
-+        while read line; do
-+            [[ $line == END ]] && break
-+            CONF+="$line "
-+        done
-+    } < "$TESTDIR"/client.img || return 1
-+
-+    if [[ "$check" != "$CONF" ]]; then
-+        echo "Expected: '$check'"
-+        echo
-+        echo
-+        echo "Got:      '$CONF'"
-+        echo "CLIENT TEST END: $test_name [FAILED - BAD CONF]"
-+        return 1
-+    fi
-+
-+    echo "CLIENT TEST END: $test_name [OK]"
-+    return 0
-+}
-+
-+
-+test_run() {
-+    if ! run_server; then
-+        echo "Failed to start server" 1>&2
-+        return 1
-+    fi
-+    test_client || { kill_server; return 1; }
-+}
-+
-+test_client() {
-+    client_test "Multiple VLAN" \
-+        "yes" \
-+        "
-+vlan=vlan0001:ens5
-+vlan=vlan2:ens5
-+vlan=ens5.3:ens5
-+vlan=ens5.0004:ens5
-+ip=ens3:dhcp
-+ip=192.168.54.101::192.168.54.1:24:test:vlan0001:none
-+ip=192.168.55.102::192.168.55.1:24:test:vlan2:none
-+ip=192.168.56.103::192.168.56.1:24:test:ens5.3:none
-+ip=192.168.57.104::192.168.57.1:24:test:ens5.0004:none
-+rd.neednet=1
-+root=nfs:192.168.50.1:/nfs/client bootdev=ens3
-+" \
-+    'ens3 ens5.0004 ens5.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens3 # Generated by dracut initrd NAME="ens3" DEVICE="ens3" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5.0004 # Generated by dracut initrd NAME="ens5.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens5.0004" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5.3 # Generated by dracut initrd NAME="ens5.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens5.3" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="ens5" EOF ' \
-+    || return 1
-+
-+    client_test "Multiple Bonds" \
-+        "yes" \
-+        "
-+bond=bond0:ens4,ens5
-+bond=bond1:ens6,ens7
-+ip=bond0:dhcp
-+ip=bond1:dhcp
-+rd.neednet=1
-+root=nfs:192.168.50.1:/nfs/client bootdev=bond0
-+" \
-+    'bond0 bond1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens7" EOF ' \
-+    || return 1
-+
-+    client_test "Multiple Bridges" \
-+        "no" \
-+        "
-+bridge=br0:ens4,ens5
-+bridge=br1:ens6,ens7
-+ip=br0:dhcp
-+ip=br1:dhcp
-+rd.neednet=1
-+root=nfs:192.168.50.1:/nfs/client bootdev=br0
-+" \
-+    'br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens7" EOF ' \
-+    || return 1
-+
-+    kill_server
-+    return 0
-+}
-+
-+test_setup() {
-+     # Make server root
-+    dd if=/dev/null of="$TESTDIR"/server.ext3 bs=1M seek=120
-+    mke2fs -j -F -- "$TESTDIR"/server.ext3
-+    mkdir -- "$TESTDIR"/mnt
-+    mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt
-+    kernel=$KVERSION
-+    (
-+        export initdir="$TESTDIR"/mnt
-+        . "$basedir"/dracut-init.sh
-+
-+        (
-+            cd "$initdir";
-+            mkdir -p -- dev sys proc run etc var/run tmp var/lib/{dhcpd,rpcbind}
-+            mkdir -p -- var/lib/nfs/{v4recovery,rpc_pipefs}
-+            chmod 777 -- var/lib/rpcbind var/lib/nfs
-+        )
-+
-+        for _f in modules.builtin.bin modules.builtin; do
-+            [[ $srcmods/$_f ]] && break
-+        done || {
-+            dfatal "No modules.builtin.bin and modules.builtin found!"
-+            return 1
-+        }
-+
-+        for _f in modules.builtin.bin modules.builtin modules.order; do
-+            [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
-+        done
-+
-+        inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
-+            dmesg mkdir cp ping exportfs \
-+            modprobe rpc.nfsd rpc.mountd showmount tcpdump \
-+            /etc/services sleep mount chmod
-+        for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
-+            [ -f "${_terminfodir}"/l/linux ] && break
-+        done
-+        inst_multiple -o "${_terminfodir}"/l/linux
-+        type -P portmap >/dev/null && inst_multiple portmap
-+        type -P rpcbind >/dev/null && inst_multiple rpcbind
-+        [ -f /etc/netconfig ] && inst_multiple /etc/netconfig
-+        type -P dhcpd >/dev/null && inst_multiple dhcpd
-+        [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
-+        instmods nfsd sunrpc ipv6 lockd af_packet 8021q ipvlan macvlan
-+        inst_simple /etc/os-release
-+        inst ./server-init.sh /sbin/init
-+        inst ./hosts /etc/hosts
-+        inst ./exports /etc/exports
-+        inst ./dhcpd.conf /etc/dhcpd.conf
-+        inst_multiple /etc/nsswitch.conf /etc/rpc /etc/protocols
-+
-+        inst_multiple rpc.idmapd /etc/idmapd.conf
-+
-+        inst_libdir_file 'libnfsidmap_nsswitch.so*'
-+        inst_libdir_file 'libnfsidmap/*.so*'
-+        inst_libdir_file 'libnfsidmap*.so*'
-+
-+        _nsslibs=$(sed -e '/^#/d' -e 's/^.*://' -e 's/\[NOTFOUND=return\]//' /etc/nsswitch.conf \
-+            |  tr -s '[:space:]' '\n' | sort -u | tr -s '[:space:]' '|')
-+        _nsslibs=${_nsslibs#|}
-+        _nsslibs=${_nsslibs%|}
-+
-+        inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
-+
-+        inst /etc/nsswitch.conf /etc/nsswitch.conf
-+        inst /etc/passwd /etc/passwd
-+        inst /etc/group /etc/group
-+
-+        cp -a -- /etc/ld.so.conf* "$initdir"/etc
-+        ldconfig -r "$initdir"
-+        dracut_kernel_post
-+    )
-+
-+    # Make client root inside server root
-+    (
-+        export initdir="$TESTDIR"/mnt/nfs/client
-+        . "$basedir"/dracut-init.sh
-+        inst_multiple sh shutdown poweroff stty cat ps ln ip \
-+            mount dmesg mkdir cp ping grep ls sort
-+        for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
-+            [[ -f ${_terminfodir}/l/linux ]] && break
-+        done
-+        inst_multiple -o "${_terminfodir}"/l/linux
-+        inst_simple /etc/os-release
-+        inst ./client-init.sh /sbin/init
-+        (
-+            cd "$initdir"
-+            mkdir -p -- dev sys proc etc run
-+            mkdir -p -- var/lib/nfs/rpc_pipefs
-+        )
-+        inst /etc/nsswitch.conf /etc/nsswitch.conf
-+        inst /etc/passwd /etc/passwd
-+        inst /etc/group /etc/group
-+
-+        inst_multiple rpc.idmapd /etc/idmapd.conf
-+        inst_libdir_file 'libnfsidmap_nsswitch.so*'
-+        inst_libdir_file 'libnfsidmap/*.so*'
-+        inst_libdir_file 'libnfsidmap*.so*'
-+
-+        _nsslibs=$(sed -e '/^#/d' -e 's/^.*://' -e 's/\[NOTFOUND=return\]//' -- /etc/nsswitch.conf \
-+            |  tr -s '[:space:]' '\n' | sort -u | tr -s '[:space:]' '|')
-+        _nsslibs=${_nsslibs#|}
-+        _nsslibs=${_nsslibs%|}
-+
-+        inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
-+
-+        cp -a -- /etc/ld.so.conf* "$initdir"/etc
-+        ldconfig -r "$initdir"
-+    )
-+
-+    umount "$TESTDIR"/mnt
-+    rm -fr -- "$TESTDIR"/mnt
-+
-+    # Make an overlay with needed tools for the test harness
-+    (
-+        export initdir="$TESTDIR"/overlay
-+        . "$basedir"/dracut-init.sh
-+        inst_multiple poweroff shutdown
-+        inst_hook emergency 000 ./hard-off.sh
-+        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
-+    )
-+
-+    # Make server's dracut image
-+    $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
-+        --no-early-microcode \
-+        -m "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
-+        -d "ipvlan macvlan af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esb ib700wdt" \
-+        --no-hostonly-cmdline -N \
-+        -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1
-+
-+    # Make client's dracut image
-+    $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
-+        --no-early-microcode \
-+        -o "plymouth" \
-+        -a "debug" \
-+        -d "ipvlan macvlan af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esb ib700wdt" \
-+        --no-hostonly-cmdline -N \
-+        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
-+}
-+
-+kill_server() {
-+    if [[ -s "$TESTDIR"/server.pid ]]; then
-+        kill -TERM -- $(cat "$TESTDIR"/server.pid)
-+        rm -f -- "$TESTDIR"/server.pid
-+    fi
-+}
-+
-+test_cleanup() {
-+    kill_server
-+}
-+
-+. "$testdir"/test-functions
-

SOURCES/0044.patch

@@ -1,53 +0,0 @@
-From 3b89c398895abe5fc62e3c9240718310222925ef Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 10 Jun 2019 16:04:33 +0200
-Subject: [PATCH] test/IFCFG: make sure the network-legacy plugin is being used
-
-If the network-manager plugin is used instead, it wouldn't write out
-ifcfg files and we wouldn't have anything to check.
-
-While at that, also enable the test.
-
-(cherry picked from commit 2b1b3bcdcb0ddaa18337f18da515adb6284df0ab)
----
- .travis.yml                | 1 +
- README.md                  | 1 +
- test/TEST-60-IFCFG/test.sh | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 364078cf..37002e9a 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -11,6 +11,7 @@ env:
-   - IMAGE=latest TESTS=50
-   - IMAGE=latest TESTS=30
-   - IMAGE=latest TESTS=31
-+  - IMAGE=latest TESTS=60
-   - IMAGE=latest TESTS=70
-   - IMAGE=latest TESTS=99
-   - IMAGE=latest TESTS=02
-diff --git a/README.md b/README.md
-index 36ae7e1b..530f1c1b 100644
---- a/README.md
-+++ b/README.md
-@@ -27,4 +27,5 @@ dracut is an initramfs infrastructure.
- - Test 31: [![Test 31](https://ci.centos.org/job/dracut-matrix-master/TESTS=31,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=31,label=dracut-ci-slave01/)
- - Test 40: [![Test 40](https://ci.centos.org/job/dracut-matrix-master/TESTS=40,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=40,label=dracut-ci-slave01/)
- - Test 50: [![Test 50](https://ci.centos.org/job/dracut-matrix-master/TESTS=50,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=50,label=dracut-ci-slave01/)
-+- Test 60: [![Test 60](https://ci.centos.org/job/dracut-matrix-master/TESTS=60,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=60,label=dracut-ci-slave01/)
- - Test 70: [![Test 70](https://ci.centos.org/job/dracut-matrix-master/TESTS=70,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=70,label=dracut-ci-slave01/)
-diff --git a/test/TEST-60-IFCFG/test.sh b/test/TEST-60-IFCFG/test.sh
-index 8c11a7d3..8e8bd982 100755
---- a/test/TEST-60-IFCFG/test.sh
-+++ b/test/TEST-60-IFCFG/test.sh
-@@ -316,7 +316,7 @@ test_setup() {
-     $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
-         --no-early-microcode \
-         -o "plymouth" \
--        -a "debug" \
-+        -a "debug network-legacy" \
-         -d "ipvlan macvlan af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esb ib700wdt" \
-         --no-hostonly-cmdline -N \
-         -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
-

SOURCES/0045.patch

@@ -1,83 +0,0 @@
-From 15ff303dde65e97ba224a9f2cc6275cbaafee52c Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 10 Jun 2019 16:05:23 +0200
-Subject: [PATCH] test/BONDBRIDGETEAMVLAN: don't assert against ifcfg files
-
-The network-manager module writes keyfiles instead of ifcfg files. Just
-check whether the configuration got actually applied correctly.
-
-(cherry picked from commit 9dfd73bcbd899d8da4bc680fa8b3326c47b939bd)
----
- test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh |  6 +-----
- test/TEST-70-BONDBRIDGETEAMVLAN/test.sh        | 12 ++++++------
- 2 files changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh
-index 8c33ff0f..083e0f59 100755
---- a/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh
-+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh
-@@ -10,11 +10,7 @@ echo "made it to the rootfs! Powering down."
- 
- (
-     echo OK
--    ip -o -4 address show scope global | while read n if rest; do echo $if;done | sort
--    for i in /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-*; do
--	echo $i
--	grep -v 'UUID=' $i
--    done
-+    ip -o -4 address show scope global |sed -n 's/^[^:]*: \([^ ]*\) *\(.*\) scope.*/\1 \2/p' |sort
-     echo EOF
- ) > /dev/sda
- 
-diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
-index 5618baee..b6dd080c 100755
---- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
-+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
-@@ -112,8 +112,8 @@ client_test() {
-         done
-     } < "$TESTDIR"/client.img || return 1
- 
--    if [[ "$check" != "$CONF" ]]; then
--        echo "Expected: '$check'"
-+    if [[ ! "$CONF" =~ ^$check$ ]]; then
-+        echo "Expected: /^$check\$/"
-         echo
-         echo
-         echo "Got:      '$CONF'"
-@@ -150,7 +150,7 @@ ip=192.168.57.104::192.168.57.1:24:test:ens5.0004:none
- rd.neednet=1
- root=nfs:192.168.50.1:/nfs/client bootdev=ens3
- " \
--    'ens3 ens5.0004 ens5.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens3 # Generated by dracut initrd NAME="ens3" DEVICE="ens3" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5.0004 # Generated by dracut initrd NAME="ens5.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens5.0004" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5.3 # Generated by dracut initrd NAME="ens5.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens5.3" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="ens5" EOF ' \
-+    'ens3 inet 192\.168\.50\.[0-9]*/24 brd 192\.168\.50\.255 ens5\.0004 inet 192\.168\.57\.104/24 brd 192\.168\.57\.255 ens5\.3 inet 192\.168\.56\.103/24 brd 192\.168\.56\.255 vlan0001 inet 192\.168\.54\.101/24 brd 192\.168\.54\.255 vlan2 inet 192\.168\.55\.102/24 brd 192\.168\.55\.255 EOF ' \
-     || return 1
- 
-     client_test "Multiple Bonds" \
-@@ -163,7 +163,7 @@ ip=bond1:dhcp
- rd.neednet=1
- root=nfs:192.168.50.1:/nfs/client bootdev=bond0
- " \
--    'bond0 bond1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens7" EOF ' \
-+    'bond0 inet 192\.168\.50\.[0-9]*/24 brd 192\.168\.50\.255 bond1 inet 192\.168\.51\.[0-9]*/24 brd 192\.168\.51\.255 EOF ' \
-     || return 1
- 
-     client_test "Multiple Bridges" \
-@@ -176,7 +176,7 @@ ip=br1:dhcp
- rd.neednet=1
- root=nfs:192.168.50.1:/nfs/client bootdev=br0
- " \
--    'br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens7" EOF ' \
-+    'br0 inet 192\.168\.50\.[0-9]*/24 brd 192\.168\.50\.255 br1 inet 192\.168\.51\.[0-9]*/24 brd 192\.168\.51\.255 EOF ' \
-     || return 1
- 
-     kill_server
-@@ -260,7 +260,7 @@ test_setup() {
-         export initdir="$TESTDIR"/mnt/nfs/client
-         . "$basedir"/dracut-init.sh
-         inst_multiple sh shutdown poweroff stty cat ps ln ip \
--            mount dmesg mkdir cp ping grep ls sort
-+            mount dmesg mkdir cp ping grep ls sort sed
-         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
-             [[ -f ${_terminfodir}/l/linux ]] && break
-         done
-

SOURCES/0046.patch

@@ -1,37 +0,0 @@
-From 96976e84e2c8544ab32026f05da8a35b9c48b2e5 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 10 Jun 2019 16:05:49 +0200
-Subject: [PATCH] test/MULTINIC: correctly note activated devices when using
- network-manager
-
-The .did-setup files are not there. What is there is the NetworkManager
-connection files.
-
-(cherry picked from commit 393fb1ac05ec3386a07d885e99985a647634803e)
----
- test/TEST-50-MULTINIC/client-init.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/test/TEST-50-MULTINIC/client-init.sh b/test/TEST-50-MULTINIC/client-init.sh
-index 529379f0..7099dcf3 100755
---- a/test/TEST-50-MULTINIC/client-init.sh
-+++ b/test/TEST-50-MULTINIC/client-init.sh
-@@ -105,7 +105,17 @@ export TERM=linux
- export PS1='initramfs-test:\w\$ '
- stty sane
- echo "made it to the rootfs! Powering down."
-+for i in /sys/class/net/*/
-+do
-+    # booting with network-manager module
-+    state=/run/NetworkManager/devices/$(cat $i/ifindex)
-+    grep -q connection-uuid= $state 2>/dev/null || continue
-+    i=${i##*/}
-+    ip link show $i |grep -q master && continue
-+    IFACES+="$i "
-+done
- for i in /run/initramfs/net.*.did-setup; do
-+    # booting with network-legacy module
-     [ -f "$i" ] || continue
-     strglobin "$i" ":*:*:*:*:" && continue
-     i=${i%.did-setup}
-

SOURCES/0047.patch

@@ -1,115 +0,0 @@
-From 08961eef2ad09e4ce38ee034baf4e8c2b3934cd1 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 3 Sep 2019 10:44:36 -0500
-Subject: [PATCH] modules.d: fix udev rules detection of multipath devices
-
-Starting with the 0.7.7 release of the multipath tools, the multipath
-udev rules always set a value in ENV{DM_MULTIPATH_DEVICE_PATH} for any
-device that multipath scans. A value of 0 means that the device is not
-claimed by multipath, and a value of 1 means that it is. Because of
-this, udev rules that check ENV{DM_MULTIPATH_DEVICE_PATH}=="?*" will
-always return True, and act as if every scanned device is claimed by
-multipath. Checking ENV{DM_MULTIPATH_DEVICE_PATH}=="1" will work
-correctly for both the old and new versions of the multipath tools.
----
- modules.d/90dm/59-persistent-storage-dm.rules      | 2 +-
- modules.d/90dmraid/61-dmraid-imsm.rules            | 2 +-
- modules.d/90lvm/64-lvm.rules                       | 2 +-
- modules.d/90mdraid/59-persistent-storage-md.rules  | 2 +-
- modules.d/90mdraid/65-md-incremental-imsm.rules    | 2 +-
- modules.d/95udev-rules/59-persistent-storage.rules | 2 +-
- modules.d/95udev-rules/61-persistent-storage.rules | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/modules.d/90dm/59-persistent-storage-dm.rules b/modules.d/90dm/59-persistent-storage-dm.rules
-index 73b09376..2be11227 100644
---- a/modules.d/90dm/59-persistent-storage-dm.rules
-+++ b/modules.d/90dm/59-persistent-storage-dm.rules
-@@ -1,7 +1,7 @@
- SUBSYSTEM!="block", GOTO="dm_end"
- ACTION!="add|change", GOTO="dm_end"
- # Also don't process disks that are slated to be a multipath device
--ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="dm_end"
-+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="dm_end"
- 
- KERNEL!="dm-[0-9]*", GOTO="dm_end"
- ACTION=="add", GOTO="dm_end"
-diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
-index 72267d3c..8a6b215e 100644
---- a/modules.d/90dmraid/61-dmraid-imsm.rules
-+++ b/modules.d/90dmraid/61-dmraid-imsm.rules
-@@ -5,7 +5,7 @@
- SUBSYSTEM!="block", GOTO="dm_end"
- ACTION!="add|change", GOTO="dm_end"
- # Also don't process disks that are slated to be a multipath device
--ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="dm_end"
-+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="dm_end"
- 
- ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="dm_end"
- 
-diff --git a/modules.d/90lvm/64-lvm.rules b/modules.d/90lvm/64-lvm.rules
-index 3ce0c1f6..65f65249 100644
---- a/modules.d/90lvm/64-lvm.rules
-+++ b/modules.d/90lvm/64-lvm.rules
-@@ -7,7 +7,7 @@
- SUBSYSTEM!="block", GOTO="lvm_end"
- ACTION!="add|change", GOTO="lvm_end"
- # Also don't process disks that are slated to be a multipath device
--ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="lvm_end"
-+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="lvm_end"
- KERNEL=="dm-[0-9]*", ACTION=="add", GOTO="lvm_end"
- ENV{ID_FS_TYPE}!="LVM?_member", GOTO="lvm_end"
- 
-diff --git a/modules.d/90mdraid/59-persistent-storage-md.rules b/modules.d/90mdraid/59-persistent-storage-md.rules
-index 6ef858aa..96b10108 100644
---- a/modules.d/90mdraid/59-persistent-storage-md.rules
-+++ b/modules.d/90mdraid/59-persistent-storage-md.rules
-@@ -1,7 +1,7 @@
- SUBSYSTEM!="block", GOTO="md_end"
- ACTION!="add|change", GOTO="md_end"
- # Also don't process disks that are slated to be a multipath device
--ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end"
-+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="md_end"
- 
- KERNEL!="md[0-9]*|md_d[0-9]*|md/*", KERNEL!="md*", GOTO="md_end"
- 
-diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
-index d66dd012..52f5b195 100644
---- a/modules.d/90mdraid/65-md-incremental-imsm.rules
-+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
-@@ -9,7 +9,7 @@ KERNEL=="md*", ENV{ID_FS_TYPE}!="linux_raid_member", GOTO="md_end"
- KERNEL=="md*", ACTION!="change", GOTO="md_end"
- 
- # Also don't process disks that are slated to be a multipath device
--ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end"
-+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="md_end"
- 
- ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_try"
- GOTO="md_end"
-diff --git a/modules.d/95udev-rules/59-persistent-storage.rules b/modules.d/95udev-rules/59-persistent-storage.rules
-index 47ff6edd..8d8650f7 100644
---- a/modules.d/95udev-rules/59-persistent-storage.rules
-+++ b/modules.d/95udev-rules/59-persistent-storage.rules
-@@ -1,7 +1,7 @@
- SUBSYSTEM!="block", GOTO="ps_end"
- ACTION!="add|change", GOTO="ps_end"
- # Also don't process disks that are slated to be a multipath device
--ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end"
-+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="ps_end"
- 
- KERNEL=="cciss[0-9]*", IMPORT BLKID
- KERNEL=="nbd[0-9]*", IMPORT BLKID
-diff --git a/modules.d/95udev-rules/61-persistent-storage.rules b/modules.d/95udev-rules/61-persistent-storage.rules
-index 37148b07..895ecebd 100644
---- a/modules.d/95udev-rules/61-persistent-storage.rules
-+++ b/modules.d/95udev-rules/61-persistent-storage.rules
-@@ -1,7 +1,7 @@
- SUBSYSTEM!="block", GOTO="pss_end"
- ACTION!="add|change", GOTO="pss_end"
- # Also don't process disks that are slated to be a multipath device
--ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="pss_end"
-+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="pss_end"
- 
- ACTION=="change", KERNEL=="dm-[0-9]*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="1", GOTO="do_pss"
- KERNEL=="cciss[0-9]*", GOTO="do_pss"
-

SOURCES/0048.patch

@@ -1,43 +0,0 @@
-From b59ae228851713f645751742136e34b854b0712a Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 10 Nov 2016 13:57:26 +0100
-Subject: [PATCH] test/test-rpms.txt: add list of rpms to install
-
-(cherry picked from commit f432d367fc4fa7558761cb9bb4229e6c027bfa31)
----
- test/test-rpms.txt | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/test/test-rpms.txt b/test/test-rpms.txt
-new file mode 100644
-index 00000000..1723d8e9
---- /dev/null
-+++ b/test/test-rpms.txt
-@@ -0,0 +1,26 @@
-+dash
-+bridge-utils
-+asciidoc
-+mdadm
-+lvm2
-+dmraid
-+cryptsetup
-+nfs-utils
-+nbd
-+dhcp-server
-+scsi-target-utils
-+iscsi-initiator-utils
-+net-tools
-+strace
-+syslinux
-+python-imgcreate
-+genisoimage
-+btrfs-progs
-+bridge-utils
-+kmod-devel
-+gcc
-+bzip2
-+xz
-+tar
-+wget
-+rpm-build
-

SOURCES/0049.patch

@@ -1,23 +0,0 @@
-From 4ef5cdc120bdbb348345c964a19affbb3ca1fa32 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 11 Nov 2016 11:40:58 +0100
-Subject: [PATCH] test/test-rpms.txt: add gzip
-
-(cherry picked from commit 7b4173d698be5163da1e5b5b52bafd2facba4db5)
----
- test/test-rpms.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/test-rpms.txt b/test/test-rpms.txt
-index 1723d8e9..10596da7 100644
---- a/test/test-rpms.txt
-+++ b/test/test-rpms.txt
-@@ -19,6 +19,7 @@ btrfs-progs
- bridge-utils
- kmod-devel
- gcc
-+gzip
- bzip2
- xz
- tar
-

SOURCES/0050.patch

@@ -1,23 +0,0 @@
-From fe44aa1b14f427245bdfb2026f2211a19b52f5e3 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 11 Nov 2016 12:34:00 +0100
-Subject: [PATCH] test-rpms.txt: add dhcp
-
-(cherry picked from commit a081e072d894c91fcf037e267cb6793c4b0356c4)
----
- test/test-rpms.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/test-rpms.txt b/test/test-rpms.txt
-index 10596da7..95376bd2 100644
---- a/test/test-rpms.txt
-+++ b/test/test-rpms.txt
-@@ -8,6 +8,7 @@ cryptsetup
- nfs-utils
- nbd
- dhcp-server
-+dhcp
- scsi-target-utils
- iscsi-initiator-utils
- net-tools
-

SOURCES/0051.patch

@@ -1,19 +0,0 @@
-From 81babdedec8c6f7b23bbf0e3418126c4f9e5e15f Mon Sep 17 00:00:00 2001
-From: Frantisek Sumsal <frantisek@sumsal.cz>
-Date: Tue, 10 Sep 2019 16:46:55 +0200
-Subject: [PATCH] test-rpms.txt: add util-linux into the dependency list
-
----
- test/test-rpms.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/test-rpms.txt b/test/test-rpms.txt
-index 95376bd2..02577c8a 100644
---- a/test/test-rpms.txt
-+++ b/test/test-rpms.txt
-@@ -26,3 +26,4 @@ xz
- tar
- wget
- rpm-build
-+util-linux
-

SOURCES/0052.patch

@@ -1,33 +0,0 @@
-From 7843bc52777683f6a4ef953d8dde7171ff3b911c Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 24 Jul 2019 16:45:19 +0200
-Subject: [PATCH] [RHEL] network: default to network-legacy even in presence of
- nm-initrd-generator
-
-In RHEL 8.2, NetworkManager will ship with the nm-initrd-generator, but
-before the install bits fall into place we want to default to network-legacy.
-
-This unblocks the enablement of the NetworkManager bits and is intended
-to be reverted later on.
----
- modules.d/40network/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 8e2a74a3..bf252eb7 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -8,9 +8,9 @@ check() {
- # called by dracut
- depends() {
-     echo -n "kernel-network-modules "
--    if ! dracut_module_included "network-legacy" && [ -x "/usr/libexec/nm-initrd-generator" ] ; then
--        echo "network-manager"
--    else
-+    # RHEL 8.1: Default to network-legacy unless the user chose
-+    # network-manager manually
-+    if ! dracut_module_included "network-manager" ; then
-         echo "network-legacy"
-     fi
-     return 0
-

SOURCES/0053.patch

@@ -1,32 +0,0 @@
-From dcbc74b01bfb360eecadb8e59480472b86fe63d0 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Tue, 29 Oct 2019 09:35:41 -0400
-Subject: [PATCH] 01fips: fix HMAC file path resolution
-
-There is a small regression in #343: when handling the 'separate boot
-partition' case, we're checking for the kernel image in the wrong
-location: `BOOT_IMAGE` is the `/boot`-relative path to the kernel image,
-so `/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE}` expands to e.g.
-`/boot/mysubdir1/mysubdir2/mysubdir1/mysubdir2/vmlinuz...`.
-
-We should be using `BOOT_IMAGE_NAME` here instead (and in fact, the next
-if-statement does this correctly, so it might've just been accidentally
-left out of #343).
----
- modules.d/01fips/fips.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index beaa692b..c3dbcf74 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -118,7 +118,7 @@ do_fips()
- 
-         if [ -z "$BOOT_IMAGE_NAME" ]; then
-             BOOT_IMAGE_NAME="vmlinuz-${KERNEL}"
--        elif ! [ -e "/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE}" ]; then
-+        elif ! [ -e "/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE_NAME}" ]; then
-             #if /boot is not a separate partition BOOT_IMAGE might start with /boot
-             BOOT_IMAGE_PATH=${BOOT_IMAGE_PATH#"/boot"}
-             #on some achitectures BOOT_IMAGE does not contain path to kernel
-

SOURCES/0054.patch

@@ -1,33 +0,0 @@
-From 14310ca42f06c2156ab5cefd05dbaa47ae3b054d Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Tue, 29 Oct 2019 16:47:34 -0400
-Subject: [PATCH] 01fips: run sha512hmac from directory HMAC file directory
-
-That way, the HMAC file can contain a relative path instead of an
-absolute one. The issue is that right now the kernel RPM bakes the
-`/boot/vmlinuz-${kver}` path into the HMAC file which poses an issue for
-rpm-ostree systems (and any other system where the kernel isn't simply
-in the top-level `/boot`.
-
-For now, we're hacking around this in rpm-ostree:
-https://github.com/coreos/rpm-ostree/pull/1934
-
-Though I'd like to propose the same change in the kernel spec file.
----
- modules.d/01fips/fips.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index c3dbcf74..893143d0 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -135,7 +135,7 @@ do_fips()
-             return 1
-         fi
- 
--        sha512hmac -c "${BOOT_IMAGE_HMAC}" || return 1
-+        (cd "${BOOT_IMAGE_HMAC%/*}" && sha512hmac -c "${BOOT_IMAGE_HMAC}") || return 1
-     fi
- 
-     info "All initrd crypto checks done"
-

SOURCES/0055.patch

@@ -1,26 +0,0 @@
-From 89dcbbe92f008f6c4ebccfedf09d32bab4a575e5 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Tue, 29 Oct 2019 16:53:00 -0400
-Subject: [PATCH] 01fips: add / in BOOT_IMAGE_HMAC filename for clarity
-
-It's already the case the `BOOT_IMAGE_PATH` today, in the non-empty
-case, includes a trailing `/`, but let's add it to the path we build
-here too to make it more obvious.
----
- modules.d/01fips/fips.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index 893143d0..de2755b0 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -129,7 +129,7 @@ do_fips()
-             fi
-         fi
- 
--        BOOT_IMAGE_HMAC="/boot/${BOOT_IMAGE_PATH}.${BOOT_IMAGE_NAME}.hmac"
-+        BOOT_IMAGE_HMAC="/boot/${BOOT_IMAGE_PATH}/.${BOOT_IMAGE_NAME}.hmac"
-         if ! [ -e "${BOOT_IMAGE_HMAC}" ]; then
-             warn "${BOOT_IMAGE_HMAC} does not exist"
-             return 1
-

SOURCES/0056.patch

@@ -1,34 +0,0 @@
-From 9e8f172dc01f7e013bb5d302ef6c90e2dc6b30c8 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Tue, 29 Oct 2019 16:54:10 -0400
-Subject: [PATCH] 01fips: trim off GRUB boot device from BOOT_IMAGE
-
-E.g. in RHCOS, the `BOOT_IMAGE` from the cmdline is:
-
-(hd0,gpt1)/ostree/rhcos-e493371e5ee8407889029ec979955a2b86fd7e3cae5a0591b9db1cd248d966e8/vmlinuz-4.18.0-146.el8.x86_64
-
-Which of course is a GRUB thing, not an actual pathname we'll be able to
-resolve. In fact, we can simply scrap it off from the variable. Our code
-is already able to handle both cases: whether the device refers to a
-separate boot partition, or just the root filesystem with a regular
-`/boot` directory.
----
- modules.d/01fips/fips.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
-index de2755b0..559952ca 100755
---- a/modules.d/01fips/fips.sh
-+++ b/modules.d/01fips/fips.sh
-@@ -113,6 +113,10 @@ do_fips()
-         do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1
-     else
-         BOOT_IMAGE="$(getarg BOOT_IMAGE)"
-+
-+        # Trim off any leading GRUB boot device (e.g. ($root) )
-+        BOOT_IMAGE="$(echo "${BOOT_IMAGE}" | sed 's/^(.*)//')"
-+
-         BOOT_IMAGE_NAME="${BOOT_IMAGE##*/}"
-         BOOT_IMAGE_PATH="${BOOT_IMAGE%${BOOT_IMAGE_NAME}}"
- 
-