From 3ee0e3239d724a264b61162f1339ee21f5e0d16b Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 3 Apr 2024 02:24:04 +0200
Subject: [PATCH] - updated to 059

---
 compressors.patch    |  14 +-
 dracut.spec          |  31 ++-
 initrd-release.patch |  32 +--
 no_systemd.patch     | 517 +++++++++++++++++++++++--------------------
 4 files changed, 326 insertions(+), 268 deletions(-)

diff --git a/compressors.patch b/compressors.patch
index 518e919..a6d6b96 100644
--- a/compressors.patch
+++ b/compressors.patch
@@ -1,8 +1,8 @@
-diff -urpa dracut-056.orig/dracut.sh dracut-056/dracut.sh
---- dracut-056.orig/dracut.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/dracut.sh	2022-08-28 17:26:54.017178064 +0200
-@@ -202,8 +202,6 @@ Creates initial ramdisk images for prelo
-   --install-optional [LIST]  Install the space separated list of files into the
+diff -urpa dracut-059.orig/dracut.sh dracut-059/dracut.sh
+--- dracut-059.orig/dracut.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/dracut.sh	2024-04-03 01:29:40.532147553 +0200
+@@ -220,8 +220,6 @@ Creates initial ramdisk images for prelo
+                         Install the space separated list of files into the
                           initramfs, if they exist.
    --gzip                Compress the generated initramfs using gzip.
 -                         This will be done by default, unless another
@@ -10,7 +10,7 @@ diff -urpa dracut-056.orig/dracut.sh dracut-056/dracut.sh
    --bzip2               Compress the generated initramfs using bzip2.
                           Make sure your kernel has bzip2 decompression support
                           compiled in, otherwise you will not be able to boot.
-@@ -211,6 +209,8 @@ Creates initial ramdisk images for prelo
+@@ -229,6 +227,8 @@ Creates initial ramdisk images for prelo
                           Make sure your kernel has lzma support compiled in,
                           otherwise you will not be able to boot.
    --xz                  Compress the generated initramfs using xz.
@@ -19,7 +19,7 @@ diff -urpa dracut-056.orig/dracut.sh dracut-056/dracut.sh
                           Make sure that your kernel has xz support compiled
                           in, otherwise you will not be able to boot.
    --lzo                 Compress the generated initramfs using lzop.
-@@ -2388,7 +2388,7 @@ fi
+@@ -2507,7 +2507,7 @@ fi
  
  if ! [[ $compress ]]; then
      # check all known compressors, if none specified
diff --git a/dracut.spec b/dracut.spec
index 1339f8c..8a9bb79 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,12 +1,12 @@
 Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	056
-Release:	3
+Version:	059
+Release:	1
 License:	GPL v2+
 Group:		Base
-Source0:	https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	17d51f3ccc3a3a790bab6da0355ca4c2
+Source0:	https://github.com/dracutdevs/dracut/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	bce69baf6f633ecf84dea7e3bb63dd32
 Source1:	tld.conf
 Source2:	update-initramfs
 Patch1:		os-release.patch
@@ -19,7 +19,7 @@ Patch7:		initrd-release.patch
 Patch8:		crypttab-keyscript.patch
 Patch9:		bash.patch
 Patch100:	no_systemd.patch
-URL:		https://dracut.wiki.kernel.org/
+URL:		https://github.com/dracutdevs/dracut/wiki/
 BuildRequires:	asciidoc
 BuildRequires:	dash
 BuildRequires:	docbook-dtd45-xml
@@ -27,9 +27,8 @@ BuildRequires:	docbook-style-xsl
 BuildRequires:	kmod-devel >= 23
 BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.752
-BuildRequires:	tar >= 1:1.22
-BuildRequires:	xz
 Requires:	bash
 Requires:	bzip2
 Requires:	coreutils
@@ -171,7 +170,7 @@ Summary:	bash-completion for dracut
 Summary(pl.UTF-8):	Bashowe dopełnianie składni dla polecenia dracut
 Group:		Applications/Shells
 Requires:	%{name} = %{version}
-Requires:	bash-completion >= 2.0
+Requires:	bash-completion >= 1:2.0
 BuildArch:	noarch
 
 %description -n bash-completion-dracut
@@ -226,12 +225,16 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 %ifnarch ppc ppc64
 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90ppcmac
 %endif
-# remove gentoo specific modules
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/50gensplash
+
+# modules used by dracut tests
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/80test{,-makeroot,-root}
 
 # remove systemd and related stuff
 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd*,01systemd*,98dracut-systemd}
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{06dbus-broker,06dbus-daemon,06rngd,09dbus,35network-manager,35network-wicked,50plymouth,62bluetooth,80lvmmerge,91fido2,91pcsc,91pkcs11,91tpm2-tss,99memstrack}
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{35connman,35network-manager,35network-wicked}
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{06dbus-broker,06dbus-daemon,06rngd,09dbus}
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{50plymouth,62bluetooth,80lvmmerge,80lvmthinpool-monitor}
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{91fido2,91pcsc,91pkcs11,91tpm2-tss,99memstrack}
 %{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{90dmsquash-live/checkisomd5@.service,90multipath/multipathd{,-configure}.service}
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8
 
@@ -305,6 +308,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmraid/*.sh
 %dir %{dracutlibdir}/modules.d/90dmsquash-live
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live/*.sh
+%dir %{dracutlibdir}/modules.d/90dmsquash-live-autooverlay
+%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live-autooverlay/*.sh
 %dir %{dracutlibdir}/modules.d/90dmsquash-live-ntfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live-ntfs/*.sh
 %dir %{dracutlibdir}/modules.d/90kernel-modules
@@ -321,6 +326,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh
 %dir %{dracutlibdir}/modules.d/90nvdimm
 %attr(755,root,root) %{dracutlibdir}/modules.d/90nvdimm/module-setup.sh
+%dir %{dracutlibdir}/modules.d/90overlayfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/90overlayfs/*.sh
 %dir %{dracutlibdir}/modules.d/90qemu
 %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
@@ -355,6 +362,8 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/95nvmf/95-nvmf-initqueue.rules
 %dir %{dracutlibdir}/modules.d/95qeth_rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/95qeth_rules/*.sh
+%dir %{dracutlibdir}/modules.d/95virtiofs
+%attr(755,root,root) %{dracutlibdir}/modules.d/95virtiofs/*.sh
 %dir %{dracutlibdir}/modules.d/95zfcp
 %attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh
 %dir %{dracutlibdir}/modules.d/95zfcp_rules
diff --git a/initrd-release.patch b/initrd-release.patch
index 80ff994..a961195 100644
--- a/initrd-release.patch
+++ b/initrd-release.patch
@@ -1,6 +1,6 @@
-diff -urpa dracut-056.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-056/modules.d/98dracut-systemd/dracut-cmdline.sh
---- dracut-056.orig/modules.d/98dracut-systemd/dracut-cmdline.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/98dracut-systemd/dracut-cmdline.sh	2022-08-28 19:16:30.262174543 +0200
+diff -urpa dracut-059.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-059/modules.d/98dracut-systemd/dracut-cmdline.sh
+--- dracut-059.orig/modules.d/98dracut-systemd/dracut-cmdline.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/98dracut-systemd/dracut-cmdline.sh	2024-04-03 01:31:54.785960810 +0200
 @@ -5,7 +5,7 @@ if [ -f /dracut-state.sh ]; then
  fi
  type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
@@ -10,10 +10,10 @@ diff -urpa dracut-056.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-0
  [ -n "$VERSION" ] && info "dracut-$VERSION"
  
  if ! getargbool 1 'rd.hostonly'; then
-diff -urpa dracut-056.orig/modules.d/99base/dracut-lib.sh dracut-056/modules.d/99base/dracut-lib.sh
---- dracut-056.orig/modules.d/99base/dracut-lib.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/99base/dracut-lib.sh	2022-08-28 19:16:30.263174545 +0200
-@@ -385,7 +385,7 @@ splitsep() {
+diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/99base/dracut-lib.sh
+--- dracut-059.orig/modules.d/99base/dracut-lib.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/99base/dracut-lib.sh	2024-04-03 01:31:54.785960810 +0200
+@@ -365,7 +365,7 @@ splitsep() {
  }
  
  setdebug() {
@@ -22,9 +22,9 @@ diff -urpa dracut-056.orig/modules.d/99base/dracut-lib.sh dracut-056/modules.d/9
      if [ -z "$RD_DEBUG" ]; then
          if [ -e /proc/cmdline ]; then
              RD_DEBUG=no
-diff -urpa dracut-056.orig/modules.d/99base/init.sh dracut-056/modules.d/99base/init.sh
---- dracut-056.orig/modules.d/99base/init.sh	2022-08-28 19:12:37.568702916 +0200
-+++ dracut-056/modules.d/99base/init.sh	2022-08-28 19:16:30.263174545 +0200
+diff -urpa dracut-059.orig/modules.d/99base/init.sh dracut-059/modules.d/99base/init.sh
+--- dracut-059.orig/modules.d/99base/init.sh	2024-04-03 01:30:43.901003428 +0200
++++ dracut-059/modules.d/99base/init.sh	2024-04-03 01:31:54.785960810 +0200
 @@ -102,7 +102,7 @@ else
      exec 0<> /dev/console 1<> /dev/console 2<> /dev/console
  fi
@@ -34,10 +34,10 @@ diff -urpa dracut-056.orig/modules.d/99base/init.sh dracut-056/modules.d/99base/
  [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
  
  source_conf /etc/conf.d
-diff -urpa dracut-056.orig/modules.d/99base/module-setup.sh dracut-056/modules.d/99base/module-setup.sh
---- dracut-056.orig/modules.d/99base/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/99base/module-setup.sh	2022-08-28 19:23:42.688085700 +0200
-@@ -78,7 +78,7 @@ install() {
+diff -urpa dracut-059.orig/modules.d/99base/module-setup.sh dracut-059/modules.d/99base/module-setup.sh
+--- dracut-059.orig/modules.d/99base/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/99base/module-setup.sh	2024-04-03 01:31:54.785960810 +0200
+@@ -77,7 +77,7 @@ install() {
      if [[ -e $dracutsysrootdir/etc/os-release ]]; then
          # shellcheck disable=SC1090
          . "$dracutsysrootdir"/etc/os-release
@@ -46,7 +46,7 @@ diff -urpa dracut-056.orig/modules.d/99base/module-setup.sh dracut-056/modules.d
          [[ -n ${VERSION} ]] && VERSION+=" "
          [[ -n ${PRETTY_NAME} ]] && PRETTY_NAME+=" "
      else
-@@ -89,7 +89,7 @@ install() {
+@@ -88,7 +88,7 @@ install() {
              echo "ID=dracut"
              echo "VERSION_ID=\"$DRACUT_VERSION\""
              echo 'ANSI_COLOR="0;34"'
@@ -55,7 +55,7 @@ diff -urpa dracut-056.orig/modules.d/99base/module-setup.sh dracut-056/modules.d
      fi
      VERSION+="dracut-$DRACUT_VERSION"
      PRETTY_NAME+="dracut-$DRACUT_VERSION (Initramfs)"
-@@ -100,10 +100,8 @@ install() {
+@@ -99,10 +99,8 @@ install() {
          # to easily detect the dracut version if need be without
          # having it mixed in with the real underlying OS version.
          echo "DRACUT_VERSION=\"${DRACUT_VERSION}\""
diff --git a/no_systemd.patch b/no_systemd.patch
index 72f412b..f8c1f06 100644
--- a/no_systemd.patch
+++ b/no_systemd.patch
@@ -1,7 +1,7 @@
-diff -urNp -x '*.orig' dracut-056.org/dracut-init.sh dracut-056/dracut-init.sh
---- dracut-056.org/dracut-init.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/dracut-init.sh	2023-07-09 23:41:02.783913821 +0200
-@@ -1089,16 +1089,6 @@ fi
+diff -urpa dracut-059.orig/dracut-init.sh dracut-059/dracut-init.sh
+--- dracut-059.orig/dracut-init.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/dracut-init.sh	2024-04-03 01:34:16.263871644 +0200
+@@ -1183,16 +1183,6 @@ fi
  is_qemu_virtualized() {
      # 0 if a virt environment was detected
      # 1 if a virt environment could not be detected
@@ -18,9 +18,9 @@ diff -urNp -x '*.orig' dracut-056.org/dracut-init.sh dracut-056/dracut-init.sh
      for i in /sys/class/dmi/id/*_vendor; do
          [[ -f $i ]] || continue
          read -r vendor < "$i"
-diff -urNp -x '*.orig' dracut-056.org/dracut-logger.sh dracut-056/dracut-logger.sh
---- dracut-056.org/dracut-logger.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/dracut-logger.sh	2023-07-09 23:41:02.783913821 +0200
+diff -urpa dracut-059.orig/dracut-logger.sh dracut-059/dracut-logger.sh
+--- dracut-059.orig/dracut-logger.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/dracut-logger.sh	2024-04-03 01:35:06.456549565 +0200
 @@ -142,16 +142,7 @@ dlog_init() {
      fi
  
@@ -34,15 +34,15 @@ diff -urNp -x '*.orig' dracut-056.org/dracut-logger.sh dracut-056/dracut-logger.
 -            readonly _dlogfd=15
 -            systemd-cat -t 'dracut' --level-prefix=true < "$_systemdcatfile" &
 -            exec 15> "$_systemdcatfile"
--        elif ! [[ -S /dev/log ]] && [[ -w /dev/log ]] || ! command -v logger > /dev/null; then
-+        if ! [[ -S /dev/log ]] && [[ -w /dev/log ]] || ! command -v logger > /dev/null; then
+-        elif ! ([[ -S /dev/log ]] && [[ -w /dev/log ]] && command -v logger > /dev/null); then
++        if ! ([[ -S /dev/log ]] && [[ -w /dev/log ]] && command -v logger > /dev/null); then
              # We cannot log to syslog, so turn this facility off.
              kmsgloglvl=$sysloglvl
              sysloglvl=0
-diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
---- dracut-056.org/dracut.sh	2023-07-09 23:41:02.699912621 +0200
-+++ dracut-056/dracut.sh	2023-07-09 23:41:02.784913836 +0200
-@@ -1186,13 +1186,6 @@ if [[ -f $dracutbasedir/dracut-version.s
+diff -urpa dracut-059.orig/dracut.sh dracut-059/dracut.sh
+--- dracut-059.orig/dracut.sh	2024-04-03 01:29:40.532147553 +0200
++++ dracut-059/dracut.sh	2024-04-03 01:52:54.446974062 +0200
+@@ -1285,13 +1285,6 @@ if [[ -f $dracutbasedir/dracut-version.s
      . "$dracutbasedir"/dracut-version.sh
  fi
  
@@ -56,7 +56,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
  if [[ -f $dracutbasedir/dracut-init.sh ]]; then
      # shellcheck source=./dracut-init.sh
      . "$dracutbasedir"/dracut-init.sh
-@@ -1284,19 +1277,6 @@ esac
+@@ -1389,19 +1382,6 @@ esac
  
  abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
  
@@ -76,7 +76,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
  if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then
      if ! [[ -f $srcmods/modules.dep ]]; then
          if [[ -n "$(find "$srcmods" -name '*.ko*')" ]]; then
-@@ -1356,10 +1336,6 @@ if [[ ! $print_cmdline ]]; then
+@@ -1467,10 +1447,6 @@ if [[ ! $print_cmdline ]]; then
          esac
  
          if ! [[ -s $uefi_stub ]]; then
@@ -87,7 +87,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
              dfatal "Can't find a uefi stub '$uefi_stub' to create a UEFI executable"
              exit 1
          fi
-@@ -1597,66 +1573,6 @@ for dev in "${!host_fs_types[@]}"; do
+@@ -1722,66 +1698,6 @@ for dev in "${!host_fs_types[@]}"; do
      fi
  done
  
@@ -154,7 +154,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
  [[ -d $dracutsysrootdir$udevdir ]] \
      || udevdir="$(pkg-config udev --variable=udevdir 2> /dev/null)"
  if ! [[ -d $dracutsysrootdir$udevdir ]]; then
-@@ -1679,114 +1595,22 @@ fi
+@@ -1804,114 +1720,22 @@ fi
  
  [[ -d $dracutsysrootdir$udevrulesconfdir ]] || udevrulesconfdir=${udevconfdir}/rules.d
  
@@ -201,7 +201,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] \
 -    || systemdnetworkconfdir=$(pkg-config systemd --variable=systemdnetworkconfdir 2> /dev/null)
 -
--[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdsystemconfdir}/network
+-[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdutilconfdir}/network
 -
 -[[ -d $dracutsysrootdir$systemdntpunits ]] \
 -    || systemdntpunits=$(pkg-config systemd --variable=systemdntpunits 2> /dev/null)
@@ -211,7 +211,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] \
 -    || systemdntpunitsconfdir=$(pkg-config systemd --variable=systemdntpunitsconfdir 2> /dev/null)
 -
--[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdsystemconfdir}/ntp-units.d
+-[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdutilconfdir}/ntp-units.d
 -
 -[[ -d $dracutsysrootdir$systemdportable ]] \
 -    || systemdportable=$(pkg-config systemd --variable=systemdportable 2> /dev/null)
@@ -221,7 +221,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -[[ -d $dracutsysrootdir$systemdportableconfdir ]] \
 -    || systemdportableconfdir=$(pkg-config systemd --variable=systemdportableconfdir 2> /dev/null)
 -
--[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdsystemconfdir}/portable
+-[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdutilconfdir}/portable
 -
 -[[ -d $dracutsysrootdir$systemdsystemunitdir ]] \
 -    || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2> /dev/null)
@@ -236,7 +236,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -[[ -d $dracutsysrootdir$systemduserconfdir ]] \
 -    || systemduserconfdir=$(pkg-config systemd --variable=systemduserconfdir 2> /dev/null)
 -
--[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdsystemconfdir}/user
+-[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdutilconfdir}/user
 -
 -[[ -d $dracutsysrootdir$systemdsystemconfdir ]] \
 -    || systemdsystemconfdir=$(pkg-config systemd --variable=systemdsystemconfdir 2> /dev/null)
@@ -267,9 +267,9 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -[[ -d $dracutsysrootdir$tmpfilesconfdir ]] || tmpfilesconfdir=/etc/tmpfiles.d
 -
  [[ -d $dracutsysrootdir$depmodd ]] \
-     || sysctld=$(pkg-config libkmod --variable=depmodd 2> /dev/null)
+     || depmodd=$(pkg-config libkmod --variable=depmodd 2> /dev/null)
  
-@@ -1806,15 +1630,9 @@ export initdir dracutbasedir \
+@@ -1931,17 +1755,9 @@ export initdir dracutbasedir \
      stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
      debug host_fs_types host_devs swap_devs sshkey add_fstab \
      DRACUT_VERSION udevdir udevconfdir udevrulesdir udevrulesconfdir \
@@ -278,16 +278,18 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -    dbussessionconfdir dbussystem dbussystemconfdir dbussystemservices \
 -    dbussystemservicesconfdir environment environmentconfdir modulesload \
 +    prefix filesystems drivers environment environmentconfdir modulesload \
-     modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
--    systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
--    systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
+     modulesloadconfdir sysctld sysctlconfdir sysusers sysusersconfdir \
+-    systemdutildir systemdutilconfdir systemdcatalog systemdnetwork \
+-    systemdnetworkconfdir systemdntpunits systemdntpunitsconfdir \
+-    systemdportable systemdportableconfdir systemdsystemunitdir \
+-    systemdsystemconfdir systemduser systemduserconfdir \
 -    hostonly_cmdline loginstall tmpfilesdir tmpfilesconfdir depmodd \
 -    depmodconfdir
 +    hostonly_cmdline loginstall depmodd depmodconfdir
  
  mods_to_load=""
  # check all our modules to see if they should be sourced.
-@@ -2042,17 +1860,6 @@ if [[ $kernel_only != yes ]]; then
+@@ -2169,17 +1985,6 @@ if [[ $kernel_only != yes ]]; then
          cat "$f" >> "${initdir}/etc/fstab"
      done
  
@@ -304,8 +306,8 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -
      if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then
          dinfo "*** Resolving executable dependencies ***"
-         find "$initdir" -type f -perm /0111 -not -path '*.ko' -print0 \
-@@ -2587,25 +2394,4 @@ freeze_ok_for_fstype() {
+         # shellcheck disable=SC2086
+@@ -2712,25 +2517,4 @@ freeze_ok_for_fstype() {
      esac
  }
  
@@ -316,7 +318,7 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -# globally.  See e.g. https://github.com/ostreedev/ostree/commit/8642ef5ab3fec3ac8eb8f193054852f83a8bc4d0
 -if [[ -d $dracutsysrootdir/run/systemd/system ]]; then
 -    if ! sync "$outfile" 2> /dev/null; then
--        dinfo "dracut: sync operation on newly created initramfs $outfile failed"
+-        dinfo "sync operation on newly created initramfs $outfile failed"
 -        exit 1
 -    fi
 -
@@ -324,16 +326,43 @@ diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh
 -    if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
 -        FSFROZEN="$(dirname "$outfile")"
 -        if ! (fsfreeze -f "${FSFROZEN}" 2> /dev/null && fsfreeze -u "${FSFROZEN}" 2> /dev/null); then
--            dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")"
+-            dwarn "Could not fsfreeze $(dirname "$outfile")"
 -        fi
 -        unset FSFROZEN
 -    fi
 -fi
 -
  exit 0
-diff -urNp -x '*.orig' dracut-056.org/modules.d/01fips/fips.sh dracut-056/modules.d/01fips/fips.sh
---- dracut-056.org/modules.d/01fips/fips.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/01fips/fips.sh	2023-07-09 23:41:02.784913836 +0200
+diff -urpa dracut-059.orig/man/dracut.cmdline.7.asc dracut-059/man/dracut.cmdline.7.asc
+--- dracut-059.orig/man/dracut.cmdline.7.asc	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/man/dracut.cmdline.7.asc	2024-04-03 01:58:16.335321542 +0200
+@@ -1253,14 +1253,6 @@ CIO_IGNORE
+ rd.cio_accept=0.0.0180,0.0.0800,0.0.0801,0.0.0802
+ --
+ 
+-Plymouth Boot Splash
+-~~~~~~~~~~~~~~~~~~~~
+-**plymouth.enable=0**::
+-    disable the plymouth bootsplash completely.
+-
+-**rd.plymouth=0**::
+-    disable the plymouth bootsplash only for the initramfs.
+-
+ Kernel keys
+ ~~~~~~~~~~~
+ **masterkey=**__<kernel master key path name>__::
+@@ -1408,8 +1400,6 @@ iscsi_in_password:: rd.iscsi.in.password
+ 
+ iscsi_firmware:: rd.iscsi.firmware=0
+ 
+-rd_NO_PLYMOUTH:: rd.plymouth=0
+-
+ rd_retry:: rd.retry
+ 
+ rdshell:: rd.shell
+diff -urpa dracut-059.orig/modules.d/01fips/fips.sh dracut-059/modules.d/01fips/fips.sh
+--- dracut-059.orig/modules.d/01fips/fips.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/01fips/fips.sh	2024-04-03 01:34:16.263871644 +0200
 @@ -4,15 +4,9 @@ type getarg > /dev/null 2>&1 || . /lib/d
  
  # systemd lets stdout go to journal only, but the system
@@ -353,9 +382,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/01fips/fips.sh dracut-056/module
  
  mount_boot() {
      boot=$(getarg boot=)
-diff -urNp -x '*.orig' dracut-056.org/modules.d/02caps/module-setup.sh dracut-056/modules.d/02caps/module-setup.sh
---- dracut-056.org/modules.d/02caps/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/02caps/module-setup.sh	2023-07-09 23:41:02.784913836 +0200
+diff -urpa dracut-059.orig/modules.d/02caps/module-setup.sh dracut-059/modules.d/02caps/module-setup.sh
+--- dracut-059.orig/modules.d/02caps/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/02caps/module-setup.sh	2024-04-03 01:34:16.263871644 +0200
 @@ -14,12 +14,8 @@ depends() {
  
  # called by dracut
@@ -373,9 +402,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/02caps/module-setup.sh dracut-05
 +    # capsh wants bash and we need bash also
 +    inst /bin/bash
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/04watchdog/module-setup.sh dracut-056/modules.d/04watchdog/module-setup.sh
---- dracut-056.org/modules.d/04watchdog/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/04watchdog/module-setup.sh	2023-07-09 23:41:02.784913836 +0200
+diff -urpa dracut-059.orig/modules.d/04watchdog/module-setup.sh dracut-059/modules.d/04watchdog/module-setup.sh
+--- dracut-059.orig/modules.d/04watchdog/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/04watchdog/module-setup.sh	2024-04-03 01:34:16.263871644 +0200
 @@ -15,20 +15,17 @@ depends() {
  install() {
      # Do not add watchdog hooks if systemd module is included
@@ -408,9 +437,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/04watchdog/module-setup.sh dracu
      inst_hook emergency 02 "$moddir/watchdog-stop.sh"
      inst_multiple -o wdctl
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/console_init.sh dracut-056/modules.d/10i18n/console_init.sh
---- dracut-056.org/modules.d/10i18n/console_init.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/10i18n/console_init.sh	2023-07-09 23:41:02.784913836 +0200
+diff -urpa dracut-059.orig/modules.d/10i18n/console_init.sh dracut-059/modules.d/10i18n/console_init.sh
+--- dracut-059.orig/modules.d/10i18n/console_init.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/10i18n/console_init.sh	2024-04-03 01:34:16.263871644 +0200
 @@ -1,11 +1,5 @@
  #!/bin/sh
  
@@ -423,9 +452,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/console_init.sh dracut-05
  [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
  
  DEFAULT_FONT=eurlatgr
-diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/module-setup.sh dracut-056/modules.d/10i18n/module-setup.sh
---- dracut-056.org/modules.d/10i18n/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/10i18n/module-setup.sh	2023-07-09 23:41:02.784913836 +0200
+diff -urpa dracut-059.orig/modules.d/10i18n/module-setup.sh dracut-059/modules.d/10i18n/module-setup.sh
+--- dracut-059.orig/modules.d/10i18n/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/10i18n/module-setup.sh	2024-04-03 01:34:16.263871644 +0200
 @@ -18,13 +18,6 @@ depends() {
  install() {
      declare -A KEYMAPS
@@ -440,7 +469,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/module-setup.sh dracut-05
      KBDSUBDIRS=(consolefonts consoletrans keymaps unimaps)
      DEFAULT_FONT="${i18n_default_font:-eurlatgr}"
      I18N_CONF="/etc/locale.conf"
-@@ -121,11 +114,9 @@ install() {
+@@ -122,11 +115,9 @@ install() {
      install_base() {
          inst_multiple setfont loadkeys kbd_mode stty
  
@@ -455,7 +484,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/module-setup.sh dracut-05
  
          if [[ ${kbddir} != "/usr/share" ]]; then
              inst_dir /usr/share
-@@ -239,17 +230,11 @@ install() {
+@@ -244,17 +235,11 @@ install() {
              inst_simple "${kbddir}"/unimaps/"${FONT_UNIMAP}".uni
          fi
  
@@ -477,7 +506,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/module-setup.sh dracut-05
  
          return 0
      }
-@@ -278,11 +263,6 @@ install() {
+@@ -283,11 +268,6 @@ install() {
      if checks; then
          install_base
  
@@ -489,25 +518,25 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/module-setup.sh dracut-05
          if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} == "yes" ]]; then
              install_local_i18n || install_all_kbd
          else
-diff -urNp -x '*.orig' dracut-056.org/modules.d/35network-legacy/module-setup.sh dracut-056/modules.d/35network-legacy/module-setup.sh
---- dracut-056.org/modules.d/35network-legacy/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/35network-legacy/module-setup.sh	2023-07-09 23:41:02.784913836 +0200
+diff -urpa dracut-059.orig/modules.d/35network-legacy/module-setup.sh dracut-059/modules.d/35network-legacy/module-setup.sh
+--- dracut-059.orig/modules.d/35network-legacy/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/35network-legacy/module-setup.sh	2024-04-03 01:50:09.792750224 +0200
 @@ -22,12 +22,6 @@ installkernel() {
  install() {
      local _arch
  
 -    #Adding default link
 -    if dracut_module_included "systemd"; then
--        inst_multiple -o "${systemdutildir}/network/99-default.link"
--        [[ $hostonly ]] && inst_multiple -H -o "${systemdsystemconfdir}/network/*.link"
+-        inst_multiple -o "${systemdnetwork}/99-default.link"
+-        [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link"
 -    fi
 -
      inst_multiple ip dhclient sed awk grep pgrep tr expr
  
      inst_multiple -o arping arping2
-diff -urNp -x '*.orig' dracut-056.org/modules.d/35network-legacy/net-genrules.sh dracut-056/modules.d/35network-legacy/net-genrules.sh
---- dracut-056.org/modules.d/35network-legacy/net-genrules.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/35network-legacy/net-genrules.sh	2023-07-09 23:41:02.784913836 +0200
+diff -urpa dracut-059.orig/modules.d/35network-legacy/net-genrules.sh dracut-059/modules.d/35network-legacy/net-genrules.sh
+--- dracut-059.orig/modules.d/35network-legacy/net-genrules.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/35network-legacy/net-genrules.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -102,11 +102,8 @@ command -v fix_bootif > /dev/null || . /
  
          for iface in $IFACES; do
@@ -522,26 +551,25 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/35network-legacy/net-genrules.sh
              fi
          done
      # Default: We don't know the interface to use, handle all
-diff -urNp -x '*.orig' dracut-056.org/modules.d/40network/module-setup.sh dracut-056/modules.d/40network/module-setup.sh
---- dracut-056.org/modules.d/40network/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/40network/module-setup.sh	2023-07-09 23:41:02.784913836 +0200
-@@ -9,23 +9,12 @@ check() {
+diff -urpa dracut-059.orig/modules.d/40network/module-setup.sh dracut-059/modules.d/40network/module-setup.sh
+--- dracut-059.orig/modules.d/40network/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/40network/module-setup.sh	2024-04-03 01:44:08.395869097 +0200
+@@ -9,27 +9,7 @@ check() {
  depends() {
      is_qemu_virtualized && echo -n "qemu-net "
  
--    for module in network-wicked network-manager network-legacy systemd-networkd; do
+-    for module in network-wicked connman network-manager network-legacy systemd-networkd; do
 -        if dracut_module_included "$module"; then
 -            network_handler="$module"
 -            break
 -        fi
 -    done
-+    if dracut_module_included "network-legacy"; then
-+        network_handler="$module"
-+    fi
- 
-     if [ -z "$network_handler" ]; then
+-
+-    if [ -z "$network_handler" ]; then
 -        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
 -            network_handler="network-wicked"
+-        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
+-            network_handler="connman"
 -        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
 -            network_handler="network-manager"
 -        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
@@ -549,13 +577,15 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/40network/module-setup.sh dracut
 -        else
 -            network_handler="network-legacy"
 -        fi
-+        network_handler="network-legacy"
-     fi
-     echo "kernel-network-modules $network_handler"
+-    fi
+-    echo "kernel-network-modules $network_handler"
++    echo "kernel-network-modules network-legacy"
      return 0
-diff -urNp -x '*.orig' dracut-056.org/modules.d/40network/net-lib.sh dracut-056/modules.d/40network/net-lib.sh
---- dracut-056.org/modules.d/40network/net-lib.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/40network/net-lib.sh	2023-07-09 23:41:02.784913836 +0200
+ }
+ 
+diff -urpa dracut-059.orig/modules.d/40network/net-lib.sh dracut-059/modules.d/40network/net-lib.sh
+--- dracut-059.orig/modules.d/40network/net-lib.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/40network/net-lib.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -59,7 +59,7 @@ iface_name() {
  configured_ifaces() {
      local IFACES="" iface_id="" rv=1
@@ -565,10 +595,10 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/40network/net-lib.sh dracut-056/
          for iface_id in $IFACES; do
              printf "%s\n" "$(iface_name "$iface_id")"
              rv=0
-diff -urNp -x '*.orig' dracut-056.org/modules.d/50plymouth/module-setup.sh dracut-056/modules.d/50plymouth/module-setup.sh
---- dracut-056.org/modules.d/50plymouth/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/50plymouth/module-setup.sh	2023-07-09 23:41:02.784913836 +0200
-@@ -44,8 +44,6 @@ install() {
+diff -urpa dracut-059.orig/modules.d/50plymouth/module-setup.sh dracut-059/modules.d/50plymouth/module-setup.sh
+--- dracut-059.orig/modules.d/50plymouth/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/50plymouth/module-setup.sh	2024-04-03 01:34:19.367913571 +0200
+@@ -46,8 +46,6 @@ install() {
  
      inst_multiple plymouthd plymouth plymouth-set-default-theme
  
@@ -579,9 +609,19 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/50plymouth/module-setup.sh dracu
 +    inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
 +    inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90btrfs/module-setup.sh dracut-056/modules.d/90btrfs/module-setup.sh
---- dracut-056.org/modules.d/90btrfs/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90btrfs/module-setup.sh	2023-07-09 23:41:02.785913850 +0200
+diff -urpa dracut-059.orig/modules.d/80test-root/module-setup.sh dracut-059/modules.d/80test-root/module-setup.sh
+--- dracut-059.orig/modules.d/80test-root/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/80test-root/module-setup.sh	2024-04-03 01:57:03.802341909 +0200
+@@ -22,6 +22,4 @@ install() {
+     inst_binary "${dracutbasedir}/dracut-util" "/usr/bin/dracut-util"
+     ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
+     ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
+-
+-    inst_multiple -o plymouth
+ }
+diff -urpa dracut-059.orig/modules.d/90btrfs/module-setup.sh dracut-059/modules.d/90btrfs/module-setup.sh
+--- dracut-059.orig/modules.d/90btrfs/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90btrfs/module-setup.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -43,9 +43,7 @@ install() {
          inst_rules 64-btrfs-dm.rules
      fi
@@ -593,9 +633,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90btrfs/module-setup.sh dracut-0
  
      inst_multiple -o btrfsck btrfs-zero-log
      inst "$(command -v btrfs)" /sbin/btrfs
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/crypt-lib.sh dracut-056/modules.d/90crypt/crypt-lib.sh
---- dracut-056.org/modules.d/90crypt/crypt-lib.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90crypt/crypt-lib.sh	2023-07-09 23:41:02.785913850 +0200
+diff -urpa dracut-059.orig/modules.d/90crypt/crypt-lib.sh dracut-059/modules.d/90crypt/crypt-lib.sh
+--- dracut-059.orig/modules.d/90crypt/crypt-lib.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90crypt/crypt-lib.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -105,30 +105,22 @@ ask_for_password() {
  
      {
@@ -641,9 +681,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/crypt-lib.sh dracut-056/
      } 9> /.console_lock
  
      [ $ret -ne 0 ] && echo "Wrong password" >&2
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/crypt-run-generator.sh dracut-056/modules.d/90crypt/crypt-run-generator.sh
---- dracut-056.org/modules.d/90crypt/crypt-run-generator.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90crypt/crypt-run-generator.sh	2023-07-09 23:41:02.785913850 +0200
+diff -urpa dracut-059.orig/modules.d/90crypt/crypt-run-generator.sh dracut-059/modules.d/90crypt/crypt-run-generator.sh
+--- dracut-059.orig/modules.d/90crypt/crypt-run-generator.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90crypt/crypt-run-generator.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -11,7 +11,7 @@ crypttab_contains "$luks" "$dev" && exit
  allowdiscards="-"
  
@@ -662,9 +702,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/crypt-run-generator.sh d
 -    systemctl start cryptsetup.target
 -fi
  exit 0
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/module-setup.sh dracut-056/modules.d/90crypt/module-setup.sh
---- dracut-056.org/modules.d/90crypt/module-setup.sh	2023-07-09 23:41:02.704912692 +0200
-+++ dracut-056/modules.d/90crypt/module-setup.sh	2023-07-09 23:41:02.785913850 +0200
+diff -urpa dracut-059.orig/modules.d/90crypt/module-setup.sh dracut-059/modules.d/90crypt/module-setup.sh
+--- dracut-059.orig/modules.d/90crypt/module-setup.sh	2024-04-03 01:32:59.746838184 +0200
++++ dracut-059/modules.d/90crypt/module-setup.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -4,7 +4,7 @@
  check() {
      local fs
@@ -733,9 +773,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/module-setup.sh dracut-0
 -
      dracut_need_initqueue
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/parse-crypt.sh dracut-056/modules.d/90crypt/parse-crypt.sh
---- dracut-056.org/modules.d/90crypt/parse-crypt.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90crypt/parse-crypt.sh	2023-07-09 23:41:02.785913850 +0200
+diff -urpa dracut-059.orig/modules.d/90crypt/parse-crypt.sh dracut-059/modules.d/90crypt/parse-crypt.sh
+--- dracut-059.orig/modules.d/90crypt/parse-crypt.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90crypt/parse-crypt.sh	2024-04-03 01:40:00.012514381 +0200
 @@ -36,12 +36,6 @@ else
      LUKS=$(getargs rd.luks.uuid -d rd_LUKS_UUID)
      tout=$(getarg rd.luks.key.tout)
@@ -869,7 +909,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/parse-crypt.sh dracut-05
 -                printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
 -                printf -- '--unique --settled --onetime --name cryptroot-ask-%%k '
 -                # shellcheck disable=SC2016
--                printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' "$(command -v cryptroot-ask)" "$tout"
+-                printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} 0 %s"\n' "$(command -v cryptroot-ask)" "$tout"
 -            } >> /etc/udev/rules.d/70-luks.rules.new
 -        else
 -            {
@@ -881,28 +921,28 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/parse-crypt.sh dracut-05
 -        fi
 +        {
 +            printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
-+            printf -- '--unique --settled --onetime --name cryptroot-ask-%%k '
++            printf -- '--unique --settled --onetime --name crypt-run-generator-%%k '
 +            # shellcheck disable=SC2016
-+            printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' "$(command -v cryptroot-ask)" "$tout"
++            printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID}"\n' "$(command -v crypt-run-generator)"
 +        } >> /etc/udev/rules.d/70-luks.rules.new
      fi
  
      echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-056/modules.d/90dmsquash-live/dmsquash-live-root.sh
---- dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-root.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90dmsquash-live/dmsquash-live-root.sh	2023-07-09 23:41:02.785913850 +0200
-@@ -40,18 +40,11 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf"
+diff -urpa dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-059/modules.d/90dmsquash-live/dmsquash-live-root.sh
+--- dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90dmsquash-live/dmsquash-live-root.sh	2024-04-03 01:47:30.930604587 +0200
+@@ -67,18 +67,11 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf"
  fi
  getarg rd.live.check -d check || check=""
  if [ -n "$check" ]; then
 -    type plymouth > /dev/null 2>&1 && plymouth --hide-splash
 -    if [ -n "$DRACUT_SYSTEMD" ]; then
--        p=$(dev_unit_name "$livedev")
+-        p=$(dev_unit_name "$check_dev")
 -        systemctl start checkisomd5@"${p}".service
 -    else
--        checkisomd5 --verbose "$livedev"
+-        checkisomd5 --verbose "$check_dev"
 -    fi
-+    checkisomd5 --verbose "$livedev"
++    checkisomd5 --verbose "$check_dev"
      if [ $? -eq 1 ]; then
          die "CD check failed!"
          exit 1
@@ -911,7 +951,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-ro
  fi
  
  ln -s "$livedev" /run/initramfs/livedev
-@@ -142,7 +135,6 @@ do_live_overlay() {
+@@ -168,7 +161,6 @@ do_live_overlay() {
                  fi
                  if [ -n "$overlayfs" ]; then
                      unset -v overlayfs
@@ -919,7 +959,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-ro
                  fi
                  setup="yes"
              else
-@@ -151,9 +143,6 @@ do_live_overlay() {
+@@ -177,9 +169,6 @@ do_live_overlay() {
                      && [ -d /run/initramfs/overlayfs/ovlwork ]; then
                      ln -s /run/initramfs/overlayfs/overlayfs /run/overlayfs${readonly_overlay:+-r}
                      ln -s /run/initramfs/overlayfs/ovlwork /run/ovlwork${readonly_overlay:+-r}
@@ -929,7 +969,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-ro
                      overlayfs="required"
                      setup="yes"
                  fi
-@@ -162,9 +151,6 @@ do_live_overlay() {
+@@ -188,9 +177,6 @@ do_live_overlay() {
              && [ -d /run/initramfs/overlayfs$pathspec/../ovlwork ]; then
              ln -s /run/initramfs/overlayfs$pathspec /run/overlayfs${readonly_overlay:+-r}
              ln -s /run/initramfs/overlayfs$pathspec/../ovlwork /run/ovlwork${readonly_overlay:+-r}
@@ -939,7 +979,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-ro
              overlayfs="required"
              setup="yes"
          fi
-@@ -175,7 +161,6 @@ do_live_overlay() {
+@@ -201,7 +187,6 @@ do_live_overlay() {
                  die "OverlayFS is required but not available."
                  exit 1
              fi
@@ -947,28 +987,40 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-ro
              m='OverlayFS is not available; using temporary Device-mapper overlay.'
              info "$m"
              unset -v overlayfs setup
-@@ -191,29 +176,12 @@ do_live_overlay() {
-             m="$m"$'\n      All root filesystem changes will be lost on shutdown.'
-             m="$m"$'\n         Press [Enter] to continue.'
+@@ -218,40 +203,13 @@ do_live_overlay() {
+       All root filesystem changes will be lost on shutdown.
+          Press [Enter] to continue.'
              printf "\n\n\n\n%s\n\n\n" "${m}" > /dev/kmsg
 -            if [ -n "$DRACUT_SYSTEMD" ]; then
 -                if type plymouth > /dev/null 2>&1 && plymouth --ping; then
 -                    if getargbool 0 rhgb || getargbool 0 splash; then
--                        m='>>>'$'\n''>>>'$'\n''>>>'$'\n\n\n'"$m"
--                        m="${m%n.*}"$'n.\n\n\n''<<<'$'\n''<<<'$'\n''<<<'
+-                        m='>>>
+->>>
+->>>
+-
+-
+-'"$m"
+-                        m="${m%n.*}"'n.
+-
+-
+-<<<
+-<<<
+-<<<'
 -                        plymouth display-message --text="${m}"
 -                    else
 -                        plymouth ask-question --prompt="${m}" --command=true
 -                    fi
 -                else
--                    m=">>>${m//.[[:space:]]/.}  <<<"
+-                    m=">>>$(printf '%s' "$m" | tr -d '\n')  <<<"
 -                    systemd-ask-password --timeout=0 "${m}"
 -                fi
 -            else
 -                type plymouth > /dev/null 2>&1 && plymouth --ping && plymouth --quit
--                read -s -r -p $'\n\n'"${m}" -n 1 _
+-                printf '\n\n%s' "$m"
+-                read -r _
 -            fi
-+            read -s -r -p $'\n\n'"${m}" -n 1 _
++            printf '\n\n%s' "$m"
++            read -r _
          fi
          if [ -n "$overlayfs" ]; then
              if [ -n "$readonly_overlay" ] && ! [ -h /run/overlayfs-r ]; then
@@ -978,7 +1030,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-ro
              fi
          else
              dd if=/dev/null of=/overlay bs=1024 count=1 seek=$((overlay_size * 1024)) 2> /dev/null
-@@ -296,9 +264,6 @@ if [ -e "$SQUASHED" ]; then
+@@ -334,9 +292,6 @@ if [ -e "$SQUASHED" ]; then
          fi
      elif [ -d /run/initramfs/squashfs/proc ]; then
          FSIMG=$SQUASHED
@@ -988,18 +1040,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-ro
          overlayfs="required"
      else
          die "Failed to find a root filesystem in $SQUASHED."
-@@ -384,16 +349,12 @@ if [ -n "$overlayfs" ]; then
-     else
-         ovlfs=lowerdir=/run/rootfsbase
+@@ -411,10 +366,8 @@ if [ -n "$overlayfs" ]; then
+         ln -sf /run/initramfs/live /run/rootfsbase
      fi
--    if [ -z "$DRACUT_SYSTEMD" ]; then
--        printf 'mount -t overlay LiveOS_rootfs -o%s,%s %s\n' "$ROOTFLAGS" \
--            "$ovlfs",upperdir=/run/overlayfs,workdir=/run/ovlwork \
--            "$NEWROOT" > "$hookdir"/mount/01-$$-live.sh
--    fi
-+    printf 'mount -t overlay LiveOS_rootfs -o%s,%s %s\n' "$ROOTFLAGS" \
-+        "$ovlfs",upperdir=/run/overlayfs,workdir=/run/ovlwork \
-+        "$NEWROOT" > "$hookdir"/mount/01-$$-live.sh
  else
 -    if [ -z "$DRACUT_SYSTEMD" ]; then
 -        [ -n "$ROOTFLAGS" ] && ROOTFLAGS="-o $ROOTFLAGS"
@@ -1010,10 +1053,10 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-ro
  fi
  [ -e "$SQUASHED" ] && umount -l /run/initramfs/squashfs
  
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/module-setup.sh dracut-056/modules.d/90dmsquash-live/module-setup.sh
---- dracut-056.org/modules.d/90dmsquash-live/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90dmsquash-live/module-setup.sh	2023-07-09 23:41:02.785913850 +0200
-@@ -31,10 +31,6 @@ install() {
+diff -urpa dracut-059.orig/modules.d/90dmsquash-live/module-setup.sh dracut-059/modules.d/90dmsquash-live/module-setup.sh
+--- dracut-059.orig/modules.d/90dmsquash-live/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90dmsquash-live/module-setup.sh	2024-04-03 01:44:29.724157165 +0200
+@@ -31,9 +31,5 @@ install() {
      inst_hook pre-pivot 20 "$moddir/apply-live-updates.sh"
      inst_script "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root"
      inst_script "$moddir/iso-scan.sh" "/sbin/iso-scan"
@@ -1021,13 +1064,12 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/module-setup.sh
 -        inst_script "$moddir/dmsquash-generator.sh" "$systemdutildir"/system-generators/dracut-dmsquash-generator
 -        inst_simple "$moddir/checkisomd5@.service" "/etc/systemd/system/checkisomd5@.service"
 -    fi
-     # should probably just be generally included
-     inst_rules 60-cdrom_id.rules
      dracut_need_initqueue
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90kernel-modules/module-setup.sh dracut-056/modules.d/90kernel-modules/module-setup.sh
---- dracut-056.org/modules.d/90kernel-modules/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90kernel-modules/module-setup.sh	2023-07-09 23:41:02.785913850 +0200
-@@ -152,8 +152,6 @@ install() {
+ }
+diff -urpa dracut-059.orig/modules.d/90kernel-modules/module-setup.sh dracut-059/modules.d/90kernel-modules/module-setup.sh
+--- dracut-059.orig/modules.d/90kernel-modules/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90kernel-modules/module-setup.sh	2024-04-03 01:34:19.367913571 +0200
+@@ -144,9 +144,7 @@ install() {
      [[ -d /lib/modprobe.d ]] && inst_multiple -o "/lib/modprobe.d/*.conf"
      [[ -d /usr/lib/modprobe.d ]] && inst_multiple -o "/usr/lib/modprobe.d/*.conf"
      [[ $hostonly ]] && inst_multiple -H -o /etc/modprobe.d/*.conf /etc/modprobe.conf
@@ -1036,10 +1078,11 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90kernel-modules/module-setup.sh
 -    fi
 +    inst_hook cmdline 01 "$moddir/parse-kernel.sh"
      inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
+     inst_multiple -o sysctl
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90livenet/module-setup.sh dracut-056/modules.d/90livenet/module-setup.sh
---- dracut-056.org/modules.d/90livenet/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90livenet/module-setup.sh	2023-07-09 23:41:02.785913850 +0200
+diff -urpa dracut-059.orig/modules.d/90livenet/module-setup.sh dracut-059/modules.d/90livenet/module-setup.sh
+--- dracut-059.orig/modules.d/90livenet/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90livenet/module-setup.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -17,8 +17,5 @@ install() {
      inst_hook cmdline 29 "$moddir/parse-livenet.sh"
      inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh"
@@ -1049,9 +1092,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90livenet/module-setup.sh dracut
 -    fi
      dracut_need_initqueue
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90mdraid/module-setup.sh dracut-056/modules.d/90mdraid/module-setup.sh
---- dracut-056.org/modules.d/90mdraid/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90mdraid/module-setup.sh	2023-07-09 23:41:02.785913850 +0200
+diff -urpa dracut-059.orig/modules.d/90mdraid/module-setup.sh dracut-059/modules.d/90mdraid/module-setup.sh
+--- dracut-059.orig/modules.d/90mdraid/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90mdraid/module-setup.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -121,20 +121,6 @@ install() {
      inst_hook shutdown 30 "$moddir/md-shutdown.sh"
      inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
@@ -1073,10 +1116,10 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90mdraid/module-setup.sh dracut-
      inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
      dracut_need_initqueue
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/90multipath/module-setup.sh dracut-056/modules.d/90multipath/module-setup.sh
---- dracut-056.org/modules.d/90multipath/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90multipath/module-setup.sh	2023-07-09 23:41:02.786913864 +0200
-@@ -132,17 +132,8 @@ install() {
+diff -urpa dracut-059.orig/modules.d/90multipath/module-setup.sh dracut-059/modules.d/90multipath/module-setup.sh
+--- dracut-059.orig/modules.d/90multipath/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/90multipath/module-setup.sh	2024-04-03 01:39:20.659982879 +0200
+@@ -132,18 +132,8 @@ install() {
          [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/90multipath.conf"
      fi
  
@@ -1085,6 +1128,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90multipath/module-setup.sh drac
 -            inst_simple "${moddir}/multipathd-configure.service" "${systemdsystemunitdir}/multipathd-configure.service"
 -            $SYSTEMCTL -q --root "$initdir" enable multipathd-configure.service
 -        fi
+-        inst_simple "${systemdsystemunitdir}/multipathd.socket"
 -        inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service"
 -        $SYSTEMCTL -q --root "$initdir" enable multipathd.service
 -    else
@@ -1096,9 +1140,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/90multipath/module-setup.sh drac
  
      inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
      inst_hook shutdown 20 "$moddir/multipath-shutdown.sh"
-diff -urNp -x '*.orig' dracut-056.org/modules.d/91zipl/install_zipl_cmdline.sh dracut-056/modules.d/91zipl/install_zipl_cmdline.sh
---- dracut-056.org/modules.d/91zipl/install_zipl_cmdline.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/91zipl/install_zipl_cmdline.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-059/modules.d/91zipl/install_zipl_cmdline.sh
+--- dracut-059.orig/modules.d/91zipl/install_zipl_cmdline.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/91zipl/install_zipl_cmdline.sh	2024-04-03 01:34:19.367913571 +0200
 @@ -30,10 +30,6 @@ fi
  
  umount ${MNT}
@@ -1110,21 +1154,21 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/91zipl/install_zipl_cmdline.sh d
  : > /tmp/install.zipl.cmdline-done
  
  exit 0
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95debug/module-setup.sh dracut-056/modules.d/95debug/module-setup.sh
---- dracut-056.org/modules.d/95debug/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95debug/module-setup.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95debug/module-setup.sh dracut-059/modules.d/95debug/module-setup.sh
+--- dracut-059.orig/modules.d/95debug/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95debug/module-setup.sh	2024-04-03 01:40:31.656941777 +0200
 @@ -15,7 +15,7 @@ depends() {
  install() {
      inst_multiple -o ls ps grep more cat rm strace free showmount df du lsblk \
-         ping netstat rpcinfo vi scp ping6 ssh find \
+         ping netstat rpcinfo vi scp ping6 ssh find chroot \
 -        tcpdump cp dd less hostname mkdir systemd-analyze \
 +        tcpdump cp dd less hostname mkdir \
          fsck fsck.ext2 fsck.ext4 fsck.ext3 fsck.ext4dev fsck.f2fs fsck.vfat e2fsck
  
      grep '^tcpdump:' "$dracutsysrootdir"/etc/passwd 2> /dev/null >> "$initdir/etc/passwd"
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95fcoe/cleanup-fcoe.sh dracut-056/modules.d/95fcoe/cleanup-fcoe.sh
---- dracut-056.org/modules.d/95fcoe/cleanup-fcoe.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95fcoe/cleanup-fcoe.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-059/modules.d/95fcoe/cleanup-fcoe.sh
+--- dracut-059.orig/modules.d/95fcoe/cleanup-fcoe.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95fcoe/cleanup-fcoe.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -6,10 +6,8 @@ if [ -e /var/run/lldpad.pid ]; then
      lldpad -k
      # with systemd version 230, this is not necessary anymore
@@ -1140,9 +1184,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95fcoe/cleanup-fcoe.sh dracut-05
 +    cp /dev/shm/lldpad.state /run/initramfs/state/dev/shm/ > /dev/null 2>&1
 +    echo "files /dev/shm/lldpad.state" >> /run/initramfs/rwtab
  fi
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95fstab-sys/mount-sys.sh dracut-056/modules.d/95fstab-sys/mount-sys.sh
---- dracut-056.org/modules.d/95fstab-sys/mount-sys.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95fstab-sys/mount-sys.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95fstab-sys/mount-sys.sh dracut-059/modules.d/95fstab-sys/mount-sys.sh
+--- dracut-059.orig/modules.d/95fstab-sys/mount-sys.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95fstab-sys/mount-sys.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -27,9 +27,7 @@ fstab_mount() {
  
  # systemd will mount and run fsck from /etc/fstab and we don't want to
@@ -1154,9 +1198,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95fstab-sys/mount-sys.sh dracut-
  
  # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
  if [ -f "$NEWROOT"/etc/fstab.sys ]; then
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/cleanup-iscsi.sh dracut-056/modules.d/95iscsi/cleanup-iscsi.sh
---- dracut-056.org/modules.d/95iscsi/cleanup-iscsi.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95iscsi/cleanup-iscsi.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-059/modules.d/95iscsi/cleanup-iscsi.sh
+--- dracut-059.orig/modules.d/95iscsi/cleanup-iscsi.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95iscsi/cleanup-iscsi.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -1,5 +1,5 @@
  #!/bin/sh
  
@@ -1164,9 +1208,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/cleanup-iscsi.sh dracut-
 +if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
      killproc iscsiuio
  fi
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/iscsiroot.sh dracut-056/modules.d/95iscsi/iscsiroot.sh
---- dracut-056.org/modules.d/95iscsi/iscsiroot.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95iscsi/iscsiroot.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95iscsi/iscsiroot.sh dracut-059/modules.d/95iscsi/iscsiroot.sh
+--- dracut-059.orig/modules.d/95iscsi/iscsiroot.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95iscsi/iscsiroot.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -37,8 +37,7 @@ iroot=${iroot#:}
  modprobe crc32c 2> /dev/null
  
@@ -1177,7 +1221,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/iscsiroot.sh dracut-056/
      && ! [ -e /tmp/iscsiuio-started ]; then
      iscsiuio
      : > /tmp/iscsiuio-started
-@@ -159,11 +158,6 @@ handle_netroot() {
+@@ -150,11 +149,6 @@ handle_netroot() {
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator
@@ -1189,7 +1233,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/iscsiroot.sh dracut-056/
      fi
  
      if [ -z "$iscsi_initiator" ]; then
-@@ -180,11 +174,6 @@ handle_netroot() {
+@@ -171,11 +165,6 @@ handle_netroot() {
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator
@@ -1201,7 +1245,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/iscsiroot.sh dracut-056/
      fi
  
      if [ -z "$iscsi_target_port" ]; then
-@@ -204,17 +193,10 @@ handle_netroot() {
+@@ -195,17 +184,10 @@ handle_netroot() {
      if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
@@ -1221,7 +1265,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/iscsiroot.sh dracut-056/
  
      # FIXME $iscsi_protocol??
  
-@@ -226,8 +208,7 @@ handle_netroot() {
+@@ -217,8 +199,7 @@ handle_netroot() {
          wait_for_dev -n /dev/root
  
          # install mount script
@@ -1231,9 +1275,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/iscsiroot.sh dracut-056/
      fi
  
      if strglobin "$iscsi_target_ip" '*:*:*' && ! strglobin "$iscsi_target_ip" '['; then
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/module-setup.sh dracut-056/modules.d/95iscsi/module-setup.sh
---- dracut-056.org/modules.d/95iscsi/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95iscsi/module-setup.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95iscsi/module-setup.sh dracut-059/modules.d/95iscsi/module-setup.sh
+--- dracut-059.orig/modules.d/95iscsi/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95iscsi/module-setup.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -190,14 +190,6 @@ install() {
      inst_multiple umount iscsi-iname iscsiadm iscsid
      inst_binary sort
@@ -1325,9 +1369,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/module-setup.sh dracut-0
      inst_dir /var/lib/iscsi
      mkdir -p "${initdir}/var/lib/iscsi/nodes"
      # Fedora 34 iscsid wants a non-empty /var/lib/iscsi/nodes directory
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/parse-iscsiroot.sh dracut-056/modules.d/95iscsi/parse-iscsiroot.sh
---- dracut-056.org/modules.d/95iscsi/parse-iscsiroot.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95iscsi/parse-iscsiroot.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-059/modules.d/95iscsi/parse-iscsiroot.sh
+--- dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95iscsi/parse-iscsiroot.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -41,7 +41,6 @@ if [ "${root%%:*}" = "iscsi" ]; then
      netroot=$root
      # if root is not specified try to mount the whole iSCSI LUN
@@ -1386,9 +1430,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/parse-iscsiroot.sh dracu
  done
  
  # Done, all good!
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95nbd/module-setup.sh dracut-056/modules.d/95nbd/module-setup.sh
---- dracut-056.org/modules.d/95nbd/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95nbd/module-setup.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95nbd/module-setup.sh dracut-059/modules.d/95nbd/module-setup.sh
+--- dracut-059.orig/modules.d/95nbd/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95nbd/module-setup.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -32,8 +32,5 @@ install() {
      inst nbd-client
      inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"
@@ -1398,9 +1442,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95nbd/module-setup.sh dracut-056
 -    fi
      dracut_need_initqueue
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95nbd/nbdroot.sh dracut-056/modules.d/95nbd/nbdroot.sh
---- dracut-056.org/modules.d/95nbd/nbdroot.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95nbd/nbdroot.sh	2023-07-09 23:41:02.786913864 +0200
+diff -urpa dracut-059.orig/modules.d/95nbd/nbdroot.sh dracut-059/modules.d/95nbd/nbdroot.sh
+--- dracut-059.orig/modules.d/95nbd/nbdroot.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95nbd/nbdroot.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -101,27 +101,13 @@ if [ "$root" = "block:/dev/root" -o "$ro
      udevadm control --reload
      wait_for_dev -n /dev/root
@@ -1434,9 +1478,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95nbd/nbdroot.sh dracut-056/modu
  fi
  
  if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95resume/module-setup.sh dracut-056/modules.d/95resume/module-setup.sh
---- dracut-056.org/modules.d/95resume/module-setup.sh	2023-07-09 23:41:02.697912592 +0200
-+++ dracut-056/modules.d/95resume/module-setup.sh	2023-07-09 23:41:02.787913878 +0200
+diff -urpa dracut-059.orig/modules.d/95resume/module-setup.sh dracut-059/modules.d/95resume/module-setup.sh
+--- dracut-059.orig/modules.d/95resume/module-setup.sh	2024-04-03 01:28:29.775191905 +0200
++++ dracut-059/modules.d/95resume/module-setup.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -40,15 +40,6 @@ install() {
          [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf"
      fi
@@ -1466,10 +1510,10 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95resume/module-setup.sh dracut-
  
      inst_script "$moddir/resume.sh" /lib/dracut/resume.sh
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95rootfs-block/module-setup.sh dracut-056/modules.d/95rootfs-block/module-setup.sh
---- dracut-056.org/modules.d/95rootfs-block/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95rootfs-block/module-setup.sh	2023-07-09 23:41:02.787913878 +0200
-@@ -77,11 +77,9 @@ install() {
+diff -urpa dracut-059.orig/modules.d/95rootfs-block/module-setup.sh dracut-059/modules.d/95rootfs-block/module-setup.sh
+--- dracut-059.orig/modules.d/95rootfs-block/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95rootfs-block/module-setup.sh	2024-04-03 01:34:19.399914002 +0200
+@@ -82,11 +82,9 @@ install() {
  
      inst_multiple umount
      inst_multiple tr
@@ -1484,9 +1528,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95rootfs-block/module-setup.sh d
  
      inst_hook initqueue/timeout 99 "$moddir/rootfallback.sh"
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/95udev-rules/module-setup.sh dracut-056/modules.d/95udev-rules/module-setup.sh
---- dracut-056.org/modules.d/95udev-rules/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/95udev-rules/module-setup.sh	2023-07-09 23:41:02.787913878 +0200
+diff -urpa dracut-059.orig/modules.d/95udev-rules/module-setup.sh dracut-059/modules.d/95udev-rules/module-setup.sh
+--- dracut-059.orig/modules.d/95udev-rules/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/95udev-rules/module-setup.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -11,18 +11,13 @@ install() {
      inst_dir /etc/udev
      inst_multiple -o /etc/udev/udev.conf
@@ -1509,9 +1553,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/95udev-rules/module-setup.sh dra
          exit 1
      fi
  
-diff -urNp -x '*.orig' dracut-056.org/modules.d/98usrmount/module-setup.sh dracut-056/modules.d/98usrmount/module-setup.sh
---- dracut-056.org/modules.d/98usrmount/module-setup.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/98usrmount/module-setup.sh	2023-07-09 23:41:02.787913878 +0200
+diff -urpa dracut-059.orig/modules.d/98usrmount/module-setup.sh dracut-059/modules.d/98usrmount/module-setup.sh
+--- dracut-059.orig/modules.d/98usrmount/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/98usrmount/module-setup.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -13,8 +13,6 @@ depends() {
  
  # called by dracut
@@ -1522,9 +1566,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/98usrmount/module-setup.sh dracu
 +    inst_hook pre-pivot 50 "$moddir/mount-usr.sh"
      :
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-dev-lib.sh dracut-056/modules.d/99base/dracut-dev-lib.sh
---- dracut-056.org/modules.d/99base/dracut-dev-lib.sh	2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/99base/dracut-dev-lib.sh	2023-07-09 23:41:02.787913878 +0200
+diff -urpa dracut-059.orig/modules.d/99base/dracut-dev-lib.sh dracut-059/modules.d/99base/dracut-dev-lib.sh
+--- dracut-059.orig/modules.d/99base/dracut-dev-lib.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/99base/dracut-dev-lib.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -25,11 +25,6 @@ str_replace() {
  dev_unit_name() {
      local dev="$1"
@@ -1610,9 +1654,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-dev-lib.sh dracut-
 -        /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
 -    fi
  }
-diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-lib.sh dracut-056/modules.d/99base/dracut-lib.sh
---- dracut-056.org/modules.d/99base/dracut-lib.sh	2023-07-09 23:41:02.702912664 +0200
-+++ dracut-056/modules.d/99base/dracut-lib.sh	2023-07-09 23:41:02.787913878 +0200
+diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/99base/dracut-lib.sh
+--- dracut-059.orig/modules.d/99base/dracut-lib.sh	2024-04-03 01:31:54.785960810 +0200
++++ dracut-059/modules.d/99base/dracut-lib.sh	2024-04-03 01:49:20.168079971 +0200
 @@ -2,7 +2,6 @@
  
  type wait_for_dev > /dev/null 2>&1 || . /lib/dracut-dev-lib.sh
@@ -1667,7 +1711,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-lib.sh dracut-056/
  
  vwarn() {
      while read -r line || [ -n "$line" ]; do
-@@ -464,10 +449,6 @@ die() {
+@@ -444,10 +429,6 @@ die() {
          source_hook "shutdown-emergency"
      fi
  
@@ -1678,7 +1722,7 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-lib.sh dracut-056/
      exit 1
  }
  
-@@ -924,43 +905,34 @@ fi
+@@ -904,43 +885,35 @@ fi
  
  _emergency_shell() {
      local _name="$1"
@@ -1713,19 +1757,11 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-lib.sh dracut-056/
 -        export PS1="$_name:\${PWD}# "
 -        [ -e /.profile ] || : > /.profile
 -
-+        echo 'To get more debug information in the report,'
-+        echo 'reboot with "rd.debug" added to the kernel command line.'
-+    fi
-+    echo
-+    echo 'Dropping to debug shell.'
-+    echo
-+    export PS1="$_name:\${PWD}# "
-+    [ -e /.profile ] || : > /.profile
-         _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
+-        _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
 -        if [ -z "$_ctty" ]; then
 -            _ctty=console
 -            while [ -f /sys/class/tty/$_ctty/active ]; do
--                _ctty=$(cat /sys/class/tty/$_ctty/active)
+-                read -r _ctty < /sys/class/tty/$_ctty/active
 -                _ctty=${_ctty##* } # last one in the list
 -            done
 -            _ctty=/dev/$_ctty
@@ -1733,10 +1769,20 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-lib.sh dracut-056/
 -        [ -c "$_ctty" ] || _ctty=/dev/tty1
 -        case "$(/usr/bin/setsid --help 2>&1)" in *--ctty*) CTTY="--ctty" ;; esac
 -        setsid $CTTY /bin/sh -i -l 0<> $_ctty 1<> $_ctty 2<> $_ctty
++        echo 'To get more debug information in the report,'
++        echo 'reboot with "rd.debug" added to the kernel command line.'
++    fi
++    echo
++    echo 'Dropping to debug shell.'
++    echo
++    export PS1="$_name:\${PWD}# "
++    [ -e /.profile ] || : > /.profile
++
++    _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
 +    if [ -z "$_ctty" ]; then
 +        _ctty=console
 +        while [ -f /sys/class/tty/$_ctty/active ]; do
-+            _ctty=$(cat /sys/class/tty/$_ctty/active)
++            read -r _ctty < /sys/class/tty/$_ctty/active
 +            _ctty=${_ctty##* } # last one in the list
 +        done
 +        _ctty=/dev/$_ctty
@@ -1747,21 +1793,9 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-lib.sh dracut-056/
  }
  
  emergency_shell() {
-@@ -976,11 +948,6 @@ emergency_shell() {
-         _rdshell_name=$2
-         action="Shutdown"
-         hook="shutdown-emergency"
--        if type plymouth > /dev/null 2>&1; then
--            plymouth --hide-splash
--        elif [ -x /oldroot/bin/plymouth ]; then
--            /oldroot/bin/plymouth --hide-splash
--        fi
-         shift 2
-     fi
- 
-diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/init.sh dracut-056/modules.d/99base/init.sh
---- dracut-056.org/modules.d/99base/init.sh	2023-07-09 23:41:02.702912664 +0200
-+++ dracut-056/modules.d/99base/init.sh	2023-07-09 23:41:02.787913878 +0200
+diff -urpa dracut-059.orig/modules.d/99base/init.sh dracut-059/modules.d/99base/init.sh
+--- dracut-059.orig/modules.d/99base/init.sh	2024-04-03 01:31:54.785960810 +0200
++++ dracut-059/modules.d/99base/init.sh	2024-04-03 01:34:19.399914002 +0200
 @@ -141,7 +141,7 @@ getargbool 0 rd.udev.info -d -y rdudevin
  getargbool 0 rd.udev.debug -d -y rdudevdebug && UDEV_LOG=debug
  
@@ -1771,24 +1805,23 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/init.sh dracut-056/module
  
  UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
  
-diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/module-setup.sh dracut-056/modules.d/99base/module-setup.sh
---- dracut-056.org/modules.d/99base/module-setup.sh	2023-07-09 23:41:02.703912678 +0200
-+++ dracut-056/modules.d/99base/module-setup.sh	2023-07-09 23:41:02.787913878 +0200
-@@ -53,11 +53,8 @@ install() {
+diff -urpa dracut-059.orig/modules.d/99base/module-setup.sh dracut-059/modules.d/99base/module-setup.sh
+--- dracut-059.orig/modules.d/99base/module-setup.sh	2024-04-03 01:31:54.785960810 +0200
++++ dracut-059/modules.d/99base/module-setup.sh	2024-04-03 01:48:14.915198647 +0200
+@@ -53,10 +53,8 @@ install() {
      inst_simple "$moddir/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
      mkdir -p "${initdir}"/var
  
 -    if ! dracut_module_included "systemd"; then
 -        inst_multiple switch_root || dfatal "Failed to install switch_root"
 -        inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
--        inst_multiple -o "$systemdutildir"/systemd-timestamp
 -    fi
 +    inst_multiple switch_root || dfatal "Failed to install switch_root"
 +    inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
  
      if [[ $realinitpath ]]; then
          for i in $realinitpath; do
-@@ -109,11 +106,8 @@ install() {
+@@ -108,11 +106,8 @@ install() {
          if [[ -n ${host_devs[*]} ]]; then
              dracut_need_initqueue
          fi
@@ -1801,3 +1834,19 @@ diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/module-setup.sh dracut-05
                  export PREFIX="$initdir"
                  export hookdir=/lib/dracut/hooks
  
+diff -urpa dracut-059.orig/modules.d/99shutdown/shutdown.sh dracut-059/modules.d/99shutdown/shutdown.sh
+--- dracut-059.orig/modules.d/99shutdown/shutdown.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/99shutdown/shutdown.sh	2024-04-03 01:56:30.249888736 +0200
+@@ -149,12 +149,6 @@ while [ $_cnt -le 40 ]; do
+ done
+ [ $_cnt -ge 40 ] && _check_shutdown final
+ 
+-if type plymouth > /dev/null 2>&1; then
+-    plymouth --hide-splash
+-elif [ -x /oldroot/bin/plymouth ]; then
+-    /oldroot/bin/plymouth --hide-splash
+-fi
+-
+ getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"
+ 
+ case "$ACTION" in
-- 
2.44.0