- updated to 106

diff --git a/compressors.patch b/compressors.patch
index 620ae54d04808a019fd45474c16dcc12ec5f1ba2..baebbe39608ffad06b679959fa773c72787789cd 100644 (file)
--- a/compressors.patch
+++ b/compressors.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/dracut.sh
---- dracut-ng-105.orig/dracut.sh       2024-12-05 16:21:28.988210171 +0100
-+++ dracut-ng-105/dracut.sh    2024-12-05 16:24:17.910868888 +0100
-@@ -224,8 +224,6 @@
+diff -ur dracut-ng-106.orig/dracut.sh dracut-ng-106/dracut.sh
+--- dracut-ng-106.orig/dracut.sh       2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/dracut.sh    2025-04-19 11:24:36.317252742 +0200
+@@ -237,8 +237,6 @@
                          Install the space separated list of files into the
                           initramfs, if they exist.
    --gzip                Compress the generated initramfs using gzip.
@@ -10,7 +10,7 @@ diff -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/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.
-@@ -233,6 +231,8 @@
+@@ -246,6 +244,8 @@
                           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 -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/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.
-@@ -2411,7 +2411,7 @@
+@@ -2440,7 +2440,7 @@
  
  if ! [[ $compress ]]; then
      # check all known compressors, if none specified

diff --git a/crypttab-keyscript.patch b/crypttab-keyscript.patch
index 31af9993c2a0f6c15ba23569a3012687f182a72c..c1b1445a7ba666618e06bc504cd610208777796a 100644 (file)
--- a/crypttab-keyscript.patch
+++ b/crypttab-keyscript.patch
@@ -1,6 +1,6 @@
-diff -ur dracut-ng-105.orig/modules.d/90crypt/cryptroot-ask.sh dracut-ng-105/modules.d/90crypt/cryptroot-ask.sh
---- dracut-ng-105.orig/modules.d/90crypt/cryptroot-ask.sh      2024-12-05 16:28:20.546687792 +0100
-+++ dracut-ng-105/modules.d/90crypt/cryptroot-ask.sh   2024-12-05 16:28:31.814865122 +0100
+diff -ur dracut-ng-106.orig/modules.d/90crypt/cryptroot-ask.sh dracut-ng-106/modules.d/90crypt/cryptroot-ask.sh
+--- dracut-ng-106.orig/modules.d/90crypt/cryptroot-ask.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90crypt/cryptroot-ask.sh   2025-04-19 11:29:37.321935659 +0200
 @@ -112,6 +112,9 @@
          header=*)
              cryptsetupopts="${cryptsetupopts} --${1}"
@@ -27,10 +27,10 @@ diff -ur dracut-ng-105.orig/modules.d/90crypt/cryptroot-ask.sh dracut-ng-105/mod
  if [ $ask_passphrase -ne 0 ]; then
      luks_open="$(command -v cryptsetup) $cryptsetupopts luksOpen"
      _timeout=$(getarg "rd.luks.timeout")
-diff -ur dracut-ng-105.orig/modules.d/90crypt/module-setup.sh dracut-ng-105/modules.d/90crypt/module-setup.sh
---- dracut-ng-105.orig/modules.d/90crypt/module-setup.sh       2024-12-05 16:28:20.546687792 +0100
-+++ dracut-ng-105/modules.d/90crypt/module-setup.sh    2024-12-05 16:28:31.814865122 +0100
-@@ -121,10 +121,26 @@
+diff -ur dracut-ng-106.orig/modules.d/90crypt/module-setup.sh dracut-ng-106/modules.d/90crypt/module-setup.sh
+--- dracut-ng-106.orig/modules.d/90crypt/module-setup.sh       2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90crypt/module-setup.sh    2025-04-19 11:29:37.321935659 +0200
+@@ -119,10 +119,26 @@
                          forceentry="yes"
                          break
                          ;;

diff --git a/dracut.spec b/dracut.spec
index 0145dab22d93d81f744b8b2a1fe2373a993e7d94..2eae267bc22d08e2671f03997aa811d28220725d 100644 (file)
--- 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:       105
+Version:       106
 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://github.com/dracut-ng/dracut-ng/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 2b001f101c067e3ccd1cca6216e665e1
+# Source0-md5: f84b20c030178b4a28d2a194701f50cf
 Source1:       tld.conf
 Source2:       update-initramfs
 Patch1:                arch-libdir.patch
@@ -244,34 +244,13 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 %endif
 
 # remove modules requiring systemd
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/00systemd*
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/01systemd*
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/98dracut-systemd
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/35connman
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/35network-manager
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/06dbus-broker
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/06dbus-daemon
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/06rngd
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/09dbus
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/50plymouth
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/62bluetooth
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/80lvmmerge
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/80lvmthinpool-monitor
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/91fido2
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/91pcsc
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/91pkcs11
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/91tpm2-tss
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/95squash-erofs
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/95squash-squashfs
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/99memstrack
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/99squash
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/99squash-lib
 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90dmsquash-live/checkisomd5@.service
 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90multipath/multipathd.service
 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90multipath/multipathd-configure.service
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8
 
 # remove unneded files
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/45plymouth
 %{__rm} -r $RPM_BUILD_ROOT/usr/lib/kernel/install.d/*.install
 %{__rm} -r $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d/*.example
 
@@ -280,7 +259,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS.md README.md docs/HACKING.md dracut.html docs/dracut.png docs/dracut.svg
+%doc AUTHORS NEWS.md README.md
 %dir %{_sysconfdir}/dracut.conf.d
 %config(noreplace) %{_sysconfdir}/dracut.conf
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/01-dist.conf
@@ -310,8 +289,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/00bash/module-setup.sh
 %dir %{dracutlibdir}/modules.d/00dash
 %attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
-%dir %{dracutlibdir}/modules.d/00shell-interpreter
-%attr(755,root,root) %{dracutlibdir}/modules.d/00shell-interpreter/module-setup.sh
 %dir %{dracutlibdir}/modules.d/00warpclock
 %attr(755,root,root) %{dracutlibdir}/modules.d/00warpclock/*.sh
 %dir %{dracutlibdir}/modules.d/03modsign
@@ -328,8 +305,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh
 %dir %{dracutlibdir}/modules.d/30convertfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh
-%dir %{dracutlibdir}/modules.d/50drm
-%attr(755,root,root) %{dracutlibdir}/modules.d/50drm/module-setup.sh
+%dir %{dracutlibdir}/modules.d/45drm
+%attr(755,root,root) %{dracutlibdir}/modules.d/45drm/module-setup.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh
@@ -431,6 +408,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/99fs-lib/*.sh
 %dir %{dracutlibdir}/modules.d/99img-lib
 %attr(755,root,root) %{dracutlibdir}/modules.d/99img-lib/*.sh
+%dir %{dracutlibdir}/modules.d/99shell-interpreter
+%attr(755,root,root) %{dracutlibdir}/modules.d/99shell-interpreter/module-setup.sh
 %dir %{dracutlibdir}/modules.d/99shutdown
 %attr(755,root,root) %{dracutlibdir}/modules.d/99shutdown/*.sh
 %dir %{dracutlibdir}/modules.d/99uefi-lib
@@ -488,6 +467,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{dracutlibdir}/modules.d/01fips
 %attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh
+%{dracutlibdir}/modules.d/01fips/openssl.cnf
 %dir %{dracutlibdir}/modules.d/01fips-crypto-policies
 %attr(755,root,root) %{dracutlibdir}/modules.d/01fips-crypto-policies/*.sh
 %{dracutlibdir}/dracut.conf.d/fips

diff --git a/initrd-release.patch b/initrd-release.patch
index 2271e4a6b87072f5d8689d6e5b84d331b514dff9..79246b01a2fdddd6d423f2839018ad9c6c980548 100644 (file)
--- a/initrd-release.patch
+++ b/initrd-release.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-ng-105.orig/modules.d/99base/dracut-lib.sh dracut-ng-105/modules.d/99base/dracut-lib.sh
---- dracut-ng-105.orig/modules.d/99base/dracut-lib.sh  2024-12-05 16:27:09.637571716 +0100
-+++ dracut-ng-105/modules.d/99base/dracut-lib.sh       2024-12-05 16:27:21.001750576 +0100
-@@ -367,7 +367,7 @@
+diff -ur dracut-ng-106.orig/modules.d/99base/dracut-lib.sh dracut-ng-106/modules.d/99base/dracut-lib.sh
+--- dracut-ng-106.orig/modules.d/99base/dracut-lib.sh  2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/99base/dracut-lib.sh       2025-04-19 11:27:11.221604182 +0200
+@@ -340,7 +340,7 @@
  }
  
  setdebug() {
@@ -10,10 +10,10 @@ diff -ur dracut-ng-105.orig/modules.d/99base/dracut-lib.sh dracut-ng-105/modules
      if [ -z "$RD_DEBUG" ]; then
          if [ -e /proc/cmdline ]; then
              RD_DEBUG=no
-diff -ur dracut-ng-105.orig/modules.d/99base/init.sh dracut-ng-105/modules.d/99base/init.sh
---- dracut-ng-105.orig/modules.d/99base/init.sh        2024-12-05 16:27:09.637571716 +0100
-+++ dracut-ng-105/modules.d/99base/init.sh     2024-12-05 16:27:21.001750576 +0100
-@@ -102,7 +102,7 @@
+diff -ur dracut-ng-106.orig/modules.d/99base/init.sh dracut-ng-106/modules.d/99base/init.sh
+--- dracut-ng-106.orig/modules.d/99base/init.sh        2025-04-19 11:25:49.925419741 +0200
++++ dracut-ng-106/modules.d/99base/init.sh     2025-04-19 11:27:11.221604182 +0200
+@@ -104,7 +104,7 @@
      exec 0<> /dev/console 1<> /dev/console 2<> /dev/console
  fi
  
@@ -22,36 +22,15 @@ diff -ur dracut-ng-105.orig/modules.d/99base/init.sh dracut-ng-105/modules.d/99b
  [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
  
  source_conf /etc/conf.d
-diff -ur dracut-ng-105.orig/modules.d/99base/module-setup.sh dracut-ng-105/modules.d/99base/module-setup.sh
---- dracut-ng-105.orig/modules.d/99base/module-setup.sh        2024-12-05 16:27:09.637571716 +0100
-+++ dracut-ng-105/modules.d/99base/module-setup.sh     2024-12-05 16:27:21.001750576 +0100
-@@ -69,7 +69,7 @@
-     if [[ -e $dracutsysrootdir/etc/os-release ]]; then
-         # shellcheck disable=SC1090
-         . "$dracutsysrootdir"/etc/os-release
--        grep -hE -ve '^VERSION=' -ve '^PRETTY_NAME' "$dracutsysrootdir"/etc/os-release > "${initdir}"/usr/lib/initrd-release
-+        grep -hE -ve '^VERSION=' -ve '^PRETTY_NAME' "$dracutsysrootdir"/etc/os-release > "${initdir}"/etc/initrd-release
-         [[ -n ${VERSION} ]] && VERSION+=" "
-         [[ -n ${PRETTY_NAME} ]] && PRETTY_NAME+=" "
-     else
-@@ -80,7 +80,7 @@
-             echo "ID=dracut"
-             echo "VERSION_ID=\"$DRACUT_VERSION\""
-             echo 'ANSI_COLOR="0;34"'
--        } > "${initdir}"/usr/lib/initrd-release
-+        } > "${initdir}"/etc/initrd-release
-     fi
-     VERSION+="dracut-$DRACUT_VERSION"
-     PRETTY_NAME+="dracut-$DRACUT_VERSION (Initramfs)"
-@@ -91,10 +91,8 @@
-         # 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}\""
--    } >> "$initdir"/usr/lib/initrd-release
-+    } >> "$initdir"/etc/initrd-release
+diff -ur dracut-ng-106.orig/modules.d/99base/module-setup.sh dracut-ng-106/modules.d/99base/module-setup.sh
+--- dracut-ng-106.orig/modules.d/99base/module-setup.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/99base/module-setup.sh     2025-04-19 11:28:05.105726430 +0200
+@@ -86,7 +86,7 @@
+         echo "ID=dracut"
+         echo "VERSION_ID=\"$DRACUT_VERSION\""
+         echo 'ANSI_COLOR="0;34"'
+-    } > "${initdir}"/usr/lib/initrd-release
++    } > "${initdir}"/etc/initrd-release
+ 
      echo "dracut-$DRACUT_VERSION" > "$initdir/lib/dracut/dracut-$DRACUT_VERSION"
--    ln -sf ../usr/lib/initrd-release "$initdir"/etc/initrd-release
--    ln -sf initrd-release "$initdir"/usr/lib/os-release
-     ln -sf initrd-release "$initdir"/etc/os-release
  
-     ## save host_devs which we need bring up

diff --git a/no_systemd.patch b/no_systemd.patch
index 5193bf4593232d2f712f3e919b3e9d7011f1402e..ee88de64664db254fe308a59eeace4516e4d4321 100644 (file)
--- a/no_systemd.patch
+++ b/no_systemd.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-ng-105.orig/dracut-init.sh dracut-ng-105/dracut-init.sh
---- dracut-ng-105.orig/dracut-init.sh  2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/dracut-init.sh       2024-12-05 17:05:26.317831733 +0100
-@@ -1122,15 +1122,6 @@
+diff -ur dracut-ng-106.orig/dracut-init.sh dracut-ng-106/dracut-init.sh
+--- dracut-ng-106.orig/dracut-init.sh  2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/dracut-init.sh       2025-04-19 11:33:25.458453270 +0200
+@@ -1078,15 +1078,6 @@
  is_qemu_virtualized() {
      # 0 if a virt environment was detected
      # 1 if a virt environment could not be detected
@@ -17,9 +17,9 @@ diff -ur dracut-ng-105.orig/dracut-init.sh dracut-ng-105/dracut-init.sh
  
      for i in /sys/class/dmi/id/*_vendor; do
          [[ -f $i ]] || continue
-diff -ur dracut-ng-105.orig/dracut-logger.sh dracut-ng-105/dracut-logger.sh
---- dracut-ng-105.orig/dracut-logger.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/dracut-logger.sh     2024-12-05 17:05:26.317831733 +0100
+diff -ur dracut-ng-106.orig/dracut-logger.sh dracut-ng-106/dracut-logger.sh
+--- dracut-ng-106.orig/dracut-logger.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/dracut-logger.sh     2025-04-19 11:33:25.458453270 +0200
 @@ -142,16 +142,7 @@
      fi
  
@@ -38,10 +38,10 @@ diff -ur dracut-ng-105.orig/dracut-logger.sh dracut-ng-105/dracut-logger.sh
              # We cannot log to syslog, so turn this facility off.
              kmsgloglvl=$sysloglvl
              sysloglvl=0
-diff -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/dracut.sh
---- dracut-ng-105.orig/dracut.sh       2024-12-05 17:04:51.693285823 +0100
-+++ dracut-ng-105/dracut.sh    2024-12-05 18:32:00.611607518 +0100
-@@ -1348,13 +1348,6 @@
+diff -ur dracut-ng-106.orig/dracut.sh dracut-ng-106/dracut.sh
+--- dracut-ng-106.orig/dracut.sh       2025-04-19 11:24:36.317252742 +0200
++++ dracut-ng-106/dracut.sh    2025-04-19 11:33:25.458453270 +0200
+@@ -1375,13 +1375,6 @@
      . "$dracutbasedir"/dracut-version.sh
  fi
  
@@ -55,7 +55,7 @@ diff -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/dracut.sh
  if [[ -f $dracutbasedir/dracut-init.sh ]]; then
      # shellcheck source=./dracut-init.sh
      . "$dracutbasedir"/dracut-init.sh
-@@ -1478,52 +1471,12 @@
+@@ -1505,52 +1498,12 @@
      fi
  }
  
@@ -108,7 +108,7 @@ diff -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/dracut.sh
  # libkmod global variables
  set_global_var "libkmod" "depmodd" "/usr/lib/depmod.d"
  set_global_var "libkmod" "depmodconfdir" "/etc/depmod.d"
-@@ -1596,11 +1549,6 @@
+@@ -1623,11 +1576,6 @@
              uefi_stub="$dracutsysrootdir${systemdprefix}/lib/systemd/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
          fi
  
@@ -120,7 +120,7 @@ diff -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/dracut.sh
          if ! [[ $kernel_image ]]; then
              for kernel_image in "$dracutsysrootdir/lib/modules/$kernel/vmlinuz" "$dracutsysrootdir/boot/vmlinuz-$kernel"; do
                  [[ -s $kernel_image ]] || continue
-@@ -2091,18 +2039,6 @@
+@@ -2120,18 +2068,6 @@
          cat "$f" >> "${initdir}/etc/fstab"
      done
  
@@ -139,7 +139,7 @@ diff -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/dracut.sh
      if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then
          dinfo "*** Resolving executable dependencies ***"
          # shellcheck disable=SC2086
-@@ -2693,25 +2629,4 @@
+@@ -2722,25 +2658,4 @@
      esac
  }
  
@@ -165,9 +165,9 @@ diff -ur dracut-ng-105.orig/dracut.sh dracut-ng-105/dracut.sh
 -fi
 -
  exit 0
-diff -ur dracut-ng-105.orig/modules.d/01fips/fips.sh dracut-ng-105/modules.d/01fips/fips.sh
---- dracut-ng-105.orig/modules.d/01fips/fips.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/01fips/fips.sh     2024-12-05 17:05:26.317831733 +0100
+diff -ur dracut-ng-106.orig/modules.d/01fips/fips.sh dracut-ng-106/modules.d/01fips/fips.sh
+--- dracut-ng-106.orig/modules.d/01fips/fips.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/01fips/fips.sh     2025-04-19 11:33:25.458453270 +0200
 @@ -4,15 +4,9 @@
  
  # systemd lets stdout go to journal only, but the system
@@ -187,9 +187,9 @@ diff -ur dracut-ng-105.orig/modules.d/01fips/fips.sh dracut-ng-105/modules.d/01f
  
  # Checks if a systemd-based UKI is running and ESP UUID is set
  is_uki() {
-diff -ur dracut-ng-105.orig/modules.d/02caps/module-setup.sh dracut-ng-105/modules.d/02caps/module-setup.sh
---- dracut-ng-105.orig/modules.d/02caps/module-setup.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/02caps/module-setup.sh     2024-12-05 17:05:26.317831733 +0100
+diff -ur dracut-ng-106.orig/modules.d/02caps/module-setup.sh dracut-ng-106/modules.d/02caps/module-setup.sh
+--- dracut-ng-106.orig/modules.d/02caps/module-setup.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/02caps/module-setup.sh     2025-04-19 11:33:25.458453270 +0200
 @@ -14,12 +14,8 @@
  
  # called by dracut
@@ -207,9 +207,9 @@ diff -ur dracut-ng-105.orig/modules.d/02caps/module-setup.sh dracut-ng-105/modul
 +    # capsh wants bash and we need bash also
 +    inst /bin/bash
  }
-diff -ur dracut-ng-105.orig/modules.d/04watchdog/module-setup.sh dracut-ng-105/modules.d/04watchdog/module-setup.sh
---- dracut-ng-105.orig/modules.d/04watchdog/module-setup.sh    2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/04watchdog/module-setup.sh 2024-12-05 17:05:26.317831733 +0100
+diff -ur dracut-ng-106.orig/modules.d/04watchdog/module-setup.sh dracut-ng-106/modules.d/04watchdog/module-setup.sh
+--- dracut-ng-106.orig/modules.d/04watchdog/module-setup.sh    2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/04watchdog/module-setup.sh 2025-04-19 11:33:25.458453270 +0200
 @@ -15,20 +15,17 @@
  install() {
      # Do not add watchdog hooks if systemd module is included
@@ -242,9 +242,9 @@ diff -ur dracut-ng-105.orig/modules.d/04watchdog/module-setup.sh dracut-ng-105/m
      inst_hook emergency 02 "$moddir/watchdog-stop.sh"
      inst_multiple -o wdctl
  }
-diff -ur dracut-ng-105.orig/modules.d/10i18n/console_init.sh dracut-ng-105/modules.d/10i18n/console_init.sh
---- dracut-ng-105.orig/modules.d/10i18n/console_init.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/10i18n/console_init.sh     2024-12-05 17:05:26.317831733 +0100
+diff -ur dracut-ng-106.orig/modules.d/10i18n/console_init.sh dracut-ng-106/modules.d/10i18n/console_init.sh
+--- dracut-ng-106.orig/modules.d/10i18n/console_init.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/10i18n/console_init.sh     2025-04-19 11:33:25.462453279 +0200
 @@ -1,11 +1,5 @@
  #!/bin/sh
  
@@ -257,9 +257,9 @@ diff -ur dracut-ng-105.orig/modules.d/10i18n/console_init.sh dracut-ng-105/modul
  [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
  
  DEFAULT_FONT=eurlatgr
-diff -ur dracut-ng-105.orig/modules.d/10i18n/module-setup.sh dracut-ng-105/modules.d/10i18n/module-setup.sh
---- dracut-ng-105.orig/modules.d/10i18n/module-setup.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/10i18n/module-setup.sh     2024-12-05 17:05:26.317831733 +0100
+diff -ur dracut-ng-106.orig/modules.d/10i18n/module-setup.sh dracut-ng-106/modules.d/10i18n/module-setup.sh
+--- dracut-ng-106.orig/modules.d/10i18n/module-setup.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/10i18n/module-setup.sh     2025-04-19 11:35:35.006747238 +0200
 @@ -13,13 +13,6 @@
  install() {
      declare -A KEYMAPS
@@ -274,11 +274,23 @@ diff -ur dracut-ng-105.orig/modules.d/10i18n/module-setup.sh dracut-ng-105/modul
      KBDSUBDIRS=(consolefonts consoletrans keymaps unimaps)
      DEFAULT_FONT="${i18n_default_font:-eurlatgr}"
      I18N_CONF="/etc/locale.conf"
-@@ -117,11 +110,9 @@
-     install_base() {
-         inst_multiple setfont loadkeys kbd_mode stty
+@@ -130,23 +123,9 @@
+             done
+         fi
  
--        if ! dracut_module_included "systemd"; then
+-        if dracut_module_included "systemd"; then
+-            # https://github.com/dracutdevs/dracut/issues/796
+-            [[ -f $dracutsysrootdir${VCONFIG_CONF} ]] && inst_simple ${VCONFIG_CONF}
+-
+-            inst_rules 90-vconsole.rules
+-
+-            if [[ -e "$systemdsystemunitdir"/systemd-vconsole-setup.service ]]; then
+-                inst_multiple -o \
+-                    "$systemdutildir"/systemd-vconsole-setup \
+-                    "$systemdsystemunitdir"/systemd-vconsole-setup.service \
+-                    "$systemdsystemunitdir"/sysinit.target.wants/systemd-vconsole-setup.service
+-            fi
+-        else
 -            inst "${moddir}"/console_init.sh /lib/udev/console_init
 -            inst_rules "${moddir}"/10-console.rules
 -            inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
@@ -286,12 +298,12 @@ diff -ur dracut-ng-105.orig/modules.d/10i18n/module-setup.sh dracut-ng-105/modul
 +        inst "${moddir}"/console_init.sh /lib/udev/console_init
 +        inst_rules "${moddir}"/10-console.rules
 +        inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
+     }
  
-         if [[ ${kbddir} != "/usr/share" ]]; then
-             inst_dir /usr/share
-@@ -252,17 +243,11 @@
-             inst_simple "${kbddir}"/unimaps/"${FONT_UNIMAP}".uni
-         fi
+     install_all_kbd() {
+@@ -182,12 +161,8 @@
+         # shellcheck disable=SC1090
+         [ -f "$dracutsysrootdir"$VCONFIG_CONF ] && . "$dracutsysrootdir"$VCONFIG_CONF
  
 -        if dracut_module_included "systemd" && [[ -f $dracutsysrootdir${I18N_CONF} ]]; then
 -            inst_simple ${I18N_CONF}
@@ -302,6 +314,12 @@ diff -ur dracut-ng-105.orig/modules.d/10i18n/module-setup.sh dracut-ng-105/modul
 +        mksubdirs "${initdir}"${I18N_CONF}
 +        print_vars LC_ALL LANG >> "${initdir}"${I18N_CONF}
  
+         shopt -q -s nocasematch
+         if [[ ${UNICODE} ]]; then
+@@ -277,10 +252,8 @@
+             inst_simple "${kbddir}"/unimaps/"${FONT_UNIMAP}".uni
+         fi
+ 
 -        if ! dracut_module_included "systemd"; then
 -            mksubdirs "${initdir}"${VCONFIG_CONF}
 -            print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> "${initdir}"${VCONFIG_CONF}
@@ -311,21 +329,9 @@ diff -ur dracut-ng-105.orig/modules.d/10i18n/module-setup.sh dracut-ng-105/modul
  
          return 0
      }
-@@ -291,11 +276,6 @@
-     if checks; then
-         install_base
- 
--        # https://github.com/dracutdevs/dracut/issues/796
--        if dracut_module_included "systemd" && [[ -f $dracutsysrootdir${VCONFIG_CONF} ]]; then
--            inst_simple ${VCONFIG_CONF}
--        fi
--
-         if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} == "yes" ]]; then
-             install_local_i18n || install_all_kbd
-         else
-diff -ur dracut-ng-105.orig/modules.d/35network-legacy/module-setup.sh dracut-ng-105/modules.d/35network-legacy/module-setup.sh
---- dracut-ng-105.orig/modules.d/35network-legacy/module-setup.sh      2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/35network-legacy/module-setup.sh   2024-12-05 17:05:26.317831733 +0100
+diff -ur dracut-ng-106.orig/modules.d/35network-legacy/module-setup.sh dracut-ng-106/modules.d/35network-legacy/module-setup.sh
+--- dracut-ng-106.orig/modules.d/35network-legacy/module-setup.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/35network-legacy/module-setup.sh   2025-04-19 11:33:25.462453279 +0200
 @@ -24,14 +24,6 @@
  install() {
      local _arch
@@ -341,9 +347,9 @@ diff -ur dracut-ng-105.orig/modules.d/35network-legacy/module-setup.sh dracut-ng
      inst_multiple ip dhclient sed awk grep pgrep tr expr
  
      inst_multiple -o arping arping2
-diff -ur dracut-ng-105.orig/modules.d/35network-legacy/net-genrules.sh dracut-ng-105/modules.d/35network-legacy/net-genrules.sh
---- dracut-ng-105.orig/modules.d/35network-legacy/net-genrules.sh      2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/35network-legacy/net-genrules.sh   2024-12-05 17:05:26.409833184 +0100
+diff -ur dracut-ng-106.orig/modules.d/35network-legacy/net-genrules.sh dracut-ng-106/modules.d/35network-legacy/net-genrules.sh
+--- dracut-ng-106.orig/modules.d/35network-legacy/net-genrules.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/35network-legacy/net-genrules.sh   2025-04-19 11:33:25.462453279 +0200
 @@ -102,11 +102,8 @@
  
          for iface in $IFACES; do
@@ -358,13 +364,13 @@ diff -ur dracut-ng-105.orig/modules.d/35network-legacy/net-genrules.sh dracut-ng
              fi
          done
      # Default: We don't know the interface to use, handle all
-diff -ur dracut-ng-105.orig/modules.d/40network/module-setup.sh dracut-ng-105/modules.d/40network/module-setup.sh
---- dracut-ng-105.orig/modules.d/40network/module-setup.sh     2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/40network/module-setup.sh  2024-12-05 17:05:26.409833184 +0100
-@@ -11,14 +11,14 @@
- 
-     is_qemu_virtualized && echo -n "qemu-net "
+diff -ur dracut-ng-106.orig/modules.d/40network/module-setup.sh dracut-ng-106/modules.d/40network/module-setup.sh
+--- dracut-ng-106.orig/modules.d/40network/module-setup.sh     2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/40network/module-setup.sh  2025-04-19 11:36:27.858867421 +0200
+@@ -7,14 +7,14 @@
  
+ # called by dracut
+ depends() {
 -    for module in network-manager systemd-networkd connman network-legacy; do
 +    for module in network-manager network-legacy; do
          if dracut_module_included "$module"; then
@@ -378,9 +384,9 @@ diff -ur dracut-ng-105.orig/modules.d/40network/module-setup.sh dracut-ng-105/mo
          # install the first viable module, unless there omitted
          module_check $module > /dev/null 2>&1
          if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $module\ * ]] && check_module "$module"; then
-diff -ur dracut-ng-105.orig/modules.d/45net-lib/net-lib.sh dracut-ng-105/modules.d/45net-lib/net-lib.sh
---- dracut-ng-105.orig/modules.d/45net-lib/net-lib.sh  2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/45net-lib/net-lib.sh       2024-12-05 17:22:47.798250237 +0100
+diff -ur dracut-ng-106.orig/modules.d/45net-lib/net-lib.sh dracut-ng-106/modules.d/45net-lib/net-lib.sh
+--- dracut-ng-106.orig/modules.d/45net-lib/net-lib.sh  2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/45net-lib/net-lib.sh       2025-04-19 11:33:25.462453279 +0200
 @@ -59,7 +59,7 @@
  configured_ifaces() {
      local IFACES="" iface_id="" rv=1
@@ -390,19 +396,9 @@ diff -ur dracut-ng-105.orig/modules.d/45net-lib/net-lib.sh dracut-ng-105/modules
          for iface_id in $IFACES; do
              printf "%s\n" "$(iface_name "$iface_id")"
              rv=0
-diff -ur dracut-ng-105.orig/modules.d/80test-root/module-setup.sh dracut-ng-105/modules.d/80test-root/module-setup.sh
---- dracut-ng-105.orig/modules.d/80test-root/module-setup.sh   2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/80test-root/module-setup.sh        2024-12-05 17:05:26.429833500 +0100
-@@ -31,6 +31,4 @@
-     inst_script "${dracutbasedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
- 
-     inst_script "$moddir/test-init.sh" "/sbin/init"
--
--    inst_multiple -o plymouth
- }
-diff -ur dracut-ng-105.orig/modules.d/90btrfs/module-setup.sh dracut-ng-105/modules.d/90btrfs/module-setup.sh
---- dracut-ng-105.orig/modules.d/90btrfs/module-setup.sh       2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90btrfs/module-setup.sh    2024-12-05 17:05:26.409833184 +0100
+diff -ur dracut-ng-106.orig/modules.d/90btrfs/module-setup.sh dracut-ng-106/modules.d/90btrfs/module-setup.sh
+--- dracut-ng-106.orig/modules.d/90btrfs/module-setup.sh       2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90btrfs/module-setup.sh    2025-04-19 11:33:25.462453279 +0200
 @@ -51,9 +51,7 @@
          inst_rules 64-btrfs-dm.rules
      fi
@@ -414,9 +410,9 @@ diff -ur dracut-ng-105.orig/modules.d/90btrfs/module-setup.sh dracut-ng-105/modu
  
      inst_multiple -o btrfsck btrfs-zero-log
      inst "$(command -v btrfs)" /sbin/btrfs
-diff -ur dracut-ng-105.orig/modules.d/90crypt/crypt-lib.sh dracut-ng-105/modules.d/90crypt/crypt-lib.sh
---- dracut-ng-105.orig/modules.d/90crypt/crypt-lib.sh  2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90crypt/crypt-lib.sh       2024-12-05 17:05:26.409833184 +0100
+diff -ur dracut-ng-106.orig/modules.d/90crypt/crypt-lib.sh dracut-ng-106/modules.d/90crypt/crypt-lib.sh
+--- dracut-ng-106.orig/modules.d/90crypt/crypt-lib.sh  2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90crypt/crypt-lib.sh       2025-04-19 11:33:25.462453279 +0200
 @@ -105,30 +105,22 @@
  
      {
@@ -462,9 +458,9 @@ diff -ur dracut-ng-105.orig/modules.d/90crypt/crypt-lib.sh dracut-ng-105/modules
      } 9> /.console_lock
  
      [ $ret -ne 0 ] && echo "Wrong password" >&2
-diff -ur dracut-ng-105.orig/modules.d/90crypt/crypt-run-generator.sh dracut-ng-105/modules.d/90crypt/crypt-run-generator.sh
---- dracut-ng-105.orig/modules.d/90crypt/crypt-run-generator.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90crypt/crypt-run-generator.sh     2024-12-05 17:05:26.421833374 +0100
+diff -ur dracut-ng-106.orig/modules.d/90crypt/crypt-run-generator.sh dracut-ng-106/modules.d/90crypt/crypt-run-generator.sh
+--- dracut-ng-106.orig/modules.d/90crypt/crypt-run-generator.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90crypt/crypt-run-generator.sh     2025-04-19 11:33:25.462453279 +0200
 @@ -11,7 +11,7 @@
  allowdiscards="-"
  
@@ -483,9 +479,9 @@ diff -ur dracut-ng-105.orig/modules.d/90crypt/crypt-run-generator.sh dracut-ng-1
 -    systemctl start cryptsetup.target
 -fi
  exit 0
-diff -ur dracut-ng-105.orig/modules.d/90crypt/module-setup.sh dracut-ng-105/modules.d/90crypt/module-setup.sh
---- dracut-ng-105.orig/modules.d/90crypt/module-setup.sh       2024-12-05 17:04:51.737286516 +0100
-+++ dracut-ng-105/modules.d/90crypt/module-setup.sh    2024-12-05 17:05:26.421833374 +0100
+diff -ur dracut-ng-106.orig/modules.d/90crypt/module-setup.sh dracut-ng-106/modules.d/90crypt/module-setup.sh
+--- dracut-ng-106.orig/modules.d/90crypt/module-setup.sh       2025-04-19 11:29:37.321935659 +0200
++++ dracut-ng-106/modules.d/90crypt/module-setup.sh    2025-04-19 11:33:25.462453279 +0200
 @@ -4,7 +4,7 @@
  check() {
      local fs
@@ -495,7 +491,7 @@ diff -ur dracut-ng-105.orig/modules.d/90crypt/module-setup.sh dracut-ng-105/modu
  
      [[ $hostonly ]] || [[ $mount_needs ]] && {
          for fs in "${host_fs_types[@]}"; do
-@@ -81,13 +81,11 @@
+@@ -79,13 +79,11 @@
      fi
  
      inst_hook cmdline 30 "$moddir/parse-crypt.sh"
@@ -514,9 +510,9 @@ diff -ur dracut-ng-105.orig/modules.d/90crypt/module-setup.sh dracut-ng-105/modu
  
      if [[ $hostonly ]] && [[ -f $dracutsysrootdir/etc/crypttab ]]; then
          # filter /etc/crypttab for the devices we need
-diff -ur dracut-ng-105.orig/modules.d/90crypt/parse-crypt.sh dracut-ng-105/modules.d/90crypt/parse-crypt.sh
---- dracut-ng-105.orig/modules.d/90crypt/parse-crypt.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90crypt/parse-crypt.sh     2024-12-05 17:05:26.421833374 +0100
+diff -ur dracut-ng-106.orig/modules.d/90crypt/parse-crypt.sh dracut-ng-106/modules.d/90crypt/parse-crypt.sh
+--- dracut-ng-106.orig/modules.d/90crypt/parse-crypt.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90crypt/parse-crypt.sh     2025-04-19 11:33:25.462453279 +0200
 @@ -36,12 +36,6 @@
      LUKS=$(getargs rd.luks.uuid)
      tout=$(getarg rd.luks.key.tout)
@@ -669,9 +665,9 @@ diff -ur dracut-ng-105.orig/modules.d/90crypt/parse-crypt.sh dracut-ng-105/modul
      fi
  
      echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new
-diff -ur dracut-ng-105.orig/modules.d/90dm/dm-shutdown.sh dracut-ng-105/modules.d/90dm/dm-shutdown.sh
---- dracut-ng-105.orig/modules.d/90dm/dm-shutdown.sh   2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90dm/dm-shutdown.sh        2024-12-05 17:25:53.041166955 +0100
+diff -ur dracut-ng-106.orig/modules.d/90dm/dm-shutdown.sh dracut-ng-106/modules.d/90dm/dm-shutdown.sh
+--- dracut-ng-106.orig/modules.d/90dm/dm-shutdown.sh   2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90dm/dm-shutdown.sh        2025-04-19 11:33:25.462453279 +0200
 @@ -20,9 +20,7 @@
              return 0
              ;;
@@ -683,9 +679,9 @@ diff -ur dracut-ng-105.orig/modules.d/90dm/dm-shutdown.sh dracut-ng-105/modules.
                  DM_DISABLE_UDEV=true cryptsetup close --debug "$devname" && return 0
              else
                  dmsetup -v --noudevsync remove "$devname"
-diff -ur dracut-ng-105.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-ng-105/modules.d/90dmsquash-live/dmsquash-live-root.sh
---- dracut-ng-105.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh 2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90dmsquash-live/dmsquash-live-root.sh      2024-12-05 17:05:26.421833374 +0100
+diff -ur dracut-ng-106.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-ng-106/modules.d/90dmsquash-live/dmsquash-live-root.sh
+--- dracut-ng-106.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90dmsquash-live/dmsquash-live-root.sh      2025-04-19 11:33:25.462453279 +0200
 @@ -72,20 +72,13 @@
      fi
      getarg rd.live.check || check=""
@@ -789,7 +785,7 @@ diff -ur dracut-ng-105.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh drac
              dd if=/dev/null of=/overlay bs=1024 count=1 seek=$((overlay_size * 1024)) 2> /dev/null
 @@ -346,9 +304,6 @@
          fi
-     elif [ -d /run/initramfs/squashfs/proc ]; then
+     elif [ -d /run/initramfs/squashfs/usr ]; then
          FSIMG=$SQUASHED
 -        if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then
 -            reloadsysrootmountunit=":>/xor_overlayfs;"
@@ -810,9 +806,9 @@ diff -ur dracut-ng-105.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh drac
  fi
  [ -e "$SQUASHED" ] && umount -l /run/initramfs/squashfs
  
-diff -ur dracut-ng-105.orig/modules.d/90dmsquash-live/module-setup.sh dracut-ng-105/modules.d/90dmsquash-live/module-setup.sh
---- dracut-ng-105.orig/modules.d/90dmsquash-live/module-setup.sh       2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90dmsquash-live/module-setup.sh    2024-12-05 17:05:26.421833374 +0100
+diff -ur dracut-ng-106.orig/modules.d/90dmsquash-live/module-setup.sh dracut-ng-106/modules.d/90dmsquash-live/module-setup.sh
+--- dracut-ng-106.orig/modules.d/90dmsquash-live/module-setup.sh       2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90dmsquash-live/module-setup.sh    2025-04-19 11:33:25.462453279 +0200
 @@ -31,9 +31,5 @@
      inst_hook pre-pivot 20 "$moddir/apply-live-updates.sh"
      inst_script "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root"
@@ -823,9 +819,9 @@ diff -ur dracut-ng-105.orig/modules.d/90dmsquash-live/module-setup.sh dracut-ng-
 -    fi
      dracut_need_initqueue
  }
-diff -ur dracut-ng-105.orig/modules.d/90kernel-modules/module-setup.sh dracut-ng-105/modules.d/90kernel-modules/module-setup.sh
---- dracut-ng-105.orig/modules.d/90kernel-modules/module-setup.sh      2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90kernel-modules/module-setup.sh   2024-12-05 17:05:26.421833374 +0100
+diff -ur dracut-ng-106.orig/modules.d/90kernel-modules/module-setup.sh dracut-ng-106/modules.d/90kernel-modules/module-setup.sh
+--- dracut-ng-106.orig/modules.d/90kernel-modules/module-setup.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90kernel-modules/module-setup.sh   2025-04-19 11:33:25.466453288 +0200
 @@ -150,9 +150,7 @@
      [[ -d /lib/modprobe.d ]] && inst_multiple -o "/lib/modprobe.d/*.conf"
      [[ -d /usr/lib/modprobe.d ]] && inst_multiple -o "/usr/lib/modprobe.d/*.conf"
@@ -837,9 +833,9 @@ diff -ur dracut-ng-105.orig/modules.d/90kernel-modules/module-setup.sh dracut-ng
      inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
      inst_multiple -o sysctl
  }
-diff -ur dracut-ng-105.orig/modules.d/90livenet/module-setup.sh dracut-ng-105/modules.d/90livenet/module-setup.sh
---- dracut-ng-105.orig/modules.d/90livenet/module-setup.sh     2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90livenet/module-setup.sh  2024-12-05 17:05:26.421833374 +0100
+diff -ur dracut-ng-106.orig/modules.d/90livenet/module-setup.sh dracut-ng-106/modules.d/90livenet/module-setup.sh
+--- dracut-ng-106.orig/modules.d/90livenet/module-setup.sh     2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90livenet/module-setup.sh  2025-04-19 11:33:25.466453288 +0200
 @@ -17,8 +17,5 @@
      inst_hook cmdline 29 "$moddir/parse-livenet.sh"
      inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh"
@@ -849,9 +845,9 @@ diff -ur dracut-ng-105.orig/modules.d/90livenet/module-setup.sh dracut-ng-105/mo
 -    fi
      dracut_need_initqueue
  }
-diff -ur dracut-ng-105.orig/modules.d/90mdraid/module-setup.sh dracut-ng-105/modules.d/90mdraid/module-setup.sh
---- dracut-ng-105.orig/modules.d/90mdraid/module-setup.sh      2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90mdraid/module-setup.sh   2024-12-05 17:05:26.421833374 +0100
+diff -ur dracut-ng-106.orig/modules.d/90mdraid/module-setup.sh dracut-ng-106/modules.d/90mdraid/module-setup.sh
+--- dracut-ng-106.orig/modules.d/90mdraid/module-setup.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90mdraid/module-setup.sh   2025-04-19 11:33:25.466453288 +0200
 @@ -114,20 +114,6 @@
      inst_hook shutdown 30 "$moddir/md-shutdown.sh"
      inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
@@ -873,9 +869,9 @@ diff -ur dracut-ng-105.orig/modules.d/90mdraid/module-setup.sh dracut-ng-105/mod
      inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
      dracut_need_initqueue
  }
-diff -ur dracut-ng-105.orig/modules.d/90multipath/module-setup.sh dracut-ng-105/modules.d/90multipath/module-setup.sh
---- dracut-ng-105.orig/modules.d/90multipath/module-setup.sh   2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/90multipath/module-setup.sh        2024-12-05 17:05:26.425833437 +0100
+diff -ur dracut-ng-106.orig/modules.d/90multipath/module-setup.sh dracut-ng-106/modules.d/90multipath/module-setup.sh
+--- dracut-ng-106.orig/modules.d/90multipath/module-setup.sh   2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/90multipath/module-setup.sh        2025-04-19 11:33:25.466453288 +0200
 @@ -146,17 +146,8 @@
          [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/90multipath.conf"
      fi
@@ -896,9 +892,9 @@ diff -ur dracut-ng-105.orig/modules.d/90multipath/module-setup.sh dracut-ng-105/
  
      inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
      inst_hook shutdown 20 "$moddir/multipath-shutdown.sh"
-diff -ur dracut-ng-105.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-ng-105/modules.d/91zipl/install_zipl_cmdline.sh
---- dracut-ng-105.orig/modules.d/91zipl/install_zipl_cmdline.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/91zipl/install_zipl_cmdline.sh     2024-12-05 17:05:26.425833437 +0100
+diff -ur dracut-ng-106.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-ng-106/modules.d/91zipl/install_zipl_cmdline.sh
+--- dracut-ng-106.orig/modules.d/91zipl/install_zipl_cmdline.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/91zipl/install_zipl_cmdline.sh     2025-04-19 11:33:25.466453288 +0200
 @@ -30,10 +30,6 @@
  
  umount ${MNT}
@@ -910,9 +906,9 @@ diff -ur dracut-ng-105.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-ng-1
  : > /tmp/install.zipl.cmdline-done
  
  exit 0
-diff -ur dracut-ng-105.orig/modules.d/95debug/module-setup.sh dracut-ng-105/modules.d/95debug/module-setup.sh
---- dracut-ng-105.orig/modules.d/95debug/module-setup.sh       2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95debug/module-setup.sh    2024-12-05 17:05:26.425833437 +0100
+diff -ur dracut-ng-106.orig/modules.d/95debug/module-setup.sh dracut-ng-106/modules.d/95debug/module-setup.sh
+--- dracut-ng-106.orig/modules.d/95debug/module-setup.sh       2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95debug/module-setup.sh    2025-04-19 11:33:25.466453288 +0200
 @@ -43,7 +43,6 @@
          showmount \
          ssh \
@@ -921,9 +917,9 @@ diff -ur dracut-ng-105.orig/modules.d/95debug/module-setup.sh dracut-ng-105/modu
          tcpdump \
          vi
  
-diff -ur dracut-ng-105.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-ng-105/modules.d/95fcoe/cleanup-fcoe.sh
---- dracut-ng-105.orig/modules.d/95fcoe/cleanup-fcoe.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95fcoe/cleanup-fcoe.sh     2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-ng-106/modules.d/95fcoe/cleanup-fcoe.sh
+--- dracut-ng-106.orig/modules.d/95fcoe/cleanup-fcoe.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95fcoe/cleanup-fcoe.sh     2025-04-19 11:33:25.466453288 +0200
 @@ -6,10 +6,8 @@
      lldpad -k
      # with systemd version 230, this is not necessary anymore
@@ -939,9 +935,9 @@ diff -ur dracut-ng-105.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-ng-105/modul
 +    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 -ur dracut-ng-105.orig/modules.d/95fstab-sys/mount-sys.sh dracut-ng-105/modules.d/95fstab-sys/mount-sys.sh
---- dracut-ng-105.orig/modules.d/95fstab-sys/mount-sys.sh      2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95fstab-sys/mount-sys.sh   2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95fstab-sys/mount-sys.sh dracut-ng-106/modules.d/95fstab-sys/mount-sys.sh
+--- dracut-ng-106.orig/modules.d/95fstab-sys/mount-sys.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95fstab-sys/mount-sys.sh   2025-04-19 11:33:25.466453288 +0200
 @@ -27,9 +27,7 @@
  
  # systemd will mount and run fsck from /etc/fstab and we don't want to
@@ -953,9 +949,9 @@ diff -ur dracut-ng-105.orig/modules.d/95fstab-sys/mount-sys.sh dracut-ng-105/mod
  
  # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
  if [ -f "$NEWROOT"/etc/fstab.sys ]; then
-diff -ur dracut-ng-105.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-ng-105/modules.d/95iscsi/cleanup-iscsi.sh
---- dracut-ng-105.orig/modules.d/95iscsi/cleanup-iscsi.sh      2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95iscsi/cleanup-iscsi.sh   2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-ng-106/modules.d/95iscsi/cleanup-iscsi.sh
+--- dracut-ng-106.orig/modules.d/95iscsi/cleanup-iscsi.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95iscsi/cleanup-iscsi.sh   2025-04-19 11:33:25.466453288 +0200
 @@ -1,5 +1,5 @@
  #!/bin/sh
  
@@ -963,9 +959,9 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-ng-105/mod
 +if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
      killproc iscsiuio
  fi
-diff -ur dracut-ng-105.orig/modules.d/95iscsi/iscsiroot.sh dracut-ng-105/modules.d/95iscsi/iscsiroot.sh
---- dracut-ng-105.orig/modules.d/95iscsi/iscsiroot.sh  2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95iscsi/iscsiroot.sh       2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95iscsi/iscsiroot.sh dracut-ng-106/modules.d/95iscsi/iscsiroot.sh
+--- dracut-ng-106.orig/modules.d/95iscsi/iscsiroot.sh  2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95iscsi/iscsiroot.sh       2025-04-19 11:33:25.466453288 +0200
 @@ -37,8 +37,7 @@
  modprobe crc32c 2> /dev/null
  
@@ -976,7 +972,7 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/iscsiroot.sh dracut-ng-105/modules
      && ! [ -e /tmp/iscsiuio-started ]; then
      iscsiuio
      : > /tmp/iscsiuio-started
-@@ -150,11 +149,6 @@
+@@ -149,11 +148,6 @@
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator
@@ -988,7 +984,7 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/iscsiroot.sh dracut-ng-105/modules
      fi
  
      if [ -z "$iscsi_initiator" ]; then
-@@ -171,11 +165,6 @@
+@@ -170,11 +164,6 @@
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator
@@ -1000,7 +996,7 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/iscsiroot.sh dracut-ng-105/modules
      fi
  
      if [ -z "$iscsi_target_port" ]; then
-@@ -195,17 +184,10 @@
+@@ -194,17 +183,10 @@
      if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
@@ -1020,7 +1016,7 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/iscsiroot.sh dracut-ng-105/modules
  
      # FIXME $iscsi_protocol??
  
-@@ -217,8 +199,7 @@
+@@ -216,8 +198,7 @@
          wait_for_dev -n /dev/root
  
          # install mount script
@@ -1030,29 +1026,13 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/iscsiroot.sh dracut-ng-105/modules
      fi
  
      if strglobin "$iscsi_target_ip" '*:*:*' && ! strglobin "$iscsi_target_ip" '['; then
-diff -ur dracut-ng-105.orig/modules.d/95iscsi/module-setup.sh dracut-ng-105/modules.d/95iscsi/module-setup.sh
---- dracut-ng-105.orig/modules.d/95iscsi/module-setup.sh       2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95iscsi/module-setup.sh    2024-12-05 17:05:26.429833500 +0100
-@@ -191,14 +191,6 @@
-     inst_multiple umount iscsi-iname iscsiadm iscsid
-     inst_binary sort
- 
--    inst_multiple -o \
--        "$systemdsystemunitdir"/iscsid.socket \
--        "$systemdsystemunitdir"/iscsid.service \
--        "$systemdsystemunitdir"/iscsiuio.service \
--        "$systemdsystemunitdir"/iscsiuio.socket \
--        "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket \
--        "$systemdsystemunitdir"/sockets.target.wants/iscsiuio.socket
--
-     inst_simple /etc/iscsi/iscsid.conf
-     if [[ $hostonly ]]; then
-         inst_simple /etc/iscsi/initiatorname.iscsi
-@@ -214,74 +206,7 @@
-     inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
+diff -ur dracut-ng-106.orig/modules.d/95iscsi/module-setup.sh dracut-ng-106/modules.d/95iscsi/module-setup.sh
+--- dracut-ng-106.orig/modules.d/95iscsi/module-setup.sh       2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95iscsi/module-setup.sh    2025-04-19 11:40:42.151445657 +0200
+@@ -208,77 +208,7 @@
      inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
      inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
--
+ 
 -    if ! dracut_module_included "systemd"; then
 -        inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
 -    else
@@ -1063,7 +1043,11 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/module-setup.sh dracut-ng-105/modu
 -            "$systemdsystemunitdir"/iscsid.socket \
 -            "$systemdsystemunitdir"/iscsiuio.service \
 -            "$systemdsystemunitdir"/iscsiuio.socket \
--            iscsiadm iscsid
+-            "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket \
+-            "$systemdsystemunitdir"/sockets.target.wants/iscsiuio.socket
+-        if grep -q '^ExecStartPre=/usr/lib/open-iscsi/startup-checks.sh$' "$systemdsystemunitdir/iscsid.service"; then
+-            inst_simple /usr/lib/open-iscsi/startup-checks.sh
+-        fi
 -
 -        for i in \
 -            iscsid.socket \
@@ -1124,10 +1108,10 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/module-setup.sh dracut-ng-105/modu
      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 -ur dracut-ng-105.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-ng-105/modules.d/95iscsi/parse-iscsiroot.sh
---- dracut-ng-105.orig/modules.d/95iscsi/parse-iscsiroot.sh    2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95iscsi/parse-iscsiroot.sh 2024-12-05 17:05:26.429833500 +0100
-@@ -41,7 +41,6 @@
+diff -ur dracut-ng-106.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-ng-106/modules.d/95iscsi/parse-iscsiroot.sh
+--- dracut-ng-106.orig/modules.d/95iscsi/parse-iscsiroot.sh    2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95iscsi/parse-iscsiroot.sh 2025-04-19 11:41:35.483566932 +0200
+@@ -42,7 +42,6 @@
      netroot=$root
      # if root is not specified try to mount the whole iSCSI LUN
      printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
@@ -1135,7 +1119,7 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-ng-105/m
      root=/dev/root
  
      write_fs_tab /dev/root
-@@ -58,7 +57,6 @@
+@@ -59,7 +58,6 @@
  if [ "${root}" = "/dev/root" ] && getarg "netroot=dhcp"; then
      # if root is not specified try to mount the whole iSCSI LUN
      printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
@@ -1143,16 +1127,16 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-ng-105/m
  fi
  
  if [ -n "$iscsiroot" ]; then
-@@ -84,7 +82,7 @@
+@@ -85,7 +83,7 @@
      modprobe -b -q iscsi_boot_sysfs 2> /dev/null
      modprobe -b -q iscsi_ibft
      # if no ip= is given, but firmware
 -    echo "${DRACUT_SYSTEMD+systemctl is-active initrd-root-device.target || }[ -f '/tmp/iscsistarted-firmware' ]" > "$hookdir"/initqueue/finished/iscsi_started.sh
 +    echo "[ -f '/tmp/iscsistarted-firmware' ]" > "$hookdir"/initqueue/finished/iscsi_started.sh
-     initqueue --unique --online /sbin/iscsiroot online "iscsi:" "$NEWROOT"
-     initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "iscsi:" "$NEWROOT"
-     initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
-@@ -114,11 +112,6 @@
+     /sbin/initqueue --unique --online /sbin/iscsiroot online "iscsi:" "$NEWROOT"
+     /sbin/initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "iscsi:" "$NEWROOT"
+     /sbin/initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
+@@ -115,11 +113,6 @@
      rm -f /etc/iscsi/initiatorname.iscsi
      mkdir -p /etc/iscsi
      ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
@@ -1164,7 +1148,7 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-ng-105/m
  fi
  
  # If not given on the cmdline and initiator-name available via iBFT
-@@ -130,11 +123,6 @@
+@@ -131,11 +124,6 @@
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator
@@ -1176,8 +1160,8 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-ng-105/m
      fi
  fi
  
-@@ -149,7 +137,7 @@
-     type parse_iscsi_root > /dev/null 2>&1 || . /lib/net-lib.sh
+@@ -150,7 +138,7 @@
+     command -v parse_iscsi_root > /dev/null || . /lib/net-lib.sh
      parse_iscsi_root "$nroot" || return 1
      netroot_enc=$(str_replace "$nroot" '/' '\2f')
 -    echo "${DRACUT_SYSTEMD+systemctl is-active initrd-root-device.target || }[ -f '/tmp/iscsistarted-$netroot_enc' ]" > "$hookdir"/initqueue/finished/iscsi_started.sh
@@ -1185,9 +1169,9 @@ diff -ur dracut-ng-105.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-ng-105/m
  done
  
  # Done, all good!
-diff -ur dracut-ng-105.orig/modules.d/95nbd/module-setup.sh dracut-ng-105/modules.d/95nbd/module-setup.sh
---- dracut-ng-105.orig/modules.d/95nbd/module-setup.sh 2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95nbd/module-setup.sh      2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95nbd/module-setup.sh dracut-ng-106/modules.d/95nbd/module-setup.sh
+--- dracut-ng-106.orig/modules.d/95nbd/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95nbd/module-setup.sh      2025-04-19 11:33:29.738463002 +0200
 @@ -32,8 +32,5 @@
      inst nbd-client
      inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"
@@ -1197,16 +1181,16 @@ diff -ur dracut-ng-105.orig/modules.d/95nbd/module-setup.sh dracut-ng-105/module
 -    fi
      dracut_need_initqueue
  }
-diff -ur dracut-ng-105.orig/modules.d/95nbd/nbdroot.sh dracut-ng-105/modules.d/95nbd/nbdroot.sh
---- dracut-ng-105.orig/modules.d/95nbd/nbdroot.sh      2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95nbd/nbdroot.sh   2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95nbd/nbdroot.sh dracut-ng-106/modules.d/95nbd/nbdroot.sh
+--- dracut-ng-106.orig/modules.d/95nbd/nbdroot.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95nbd/nbdroot.sh   2025-04-19 11:37:45.095043053 +0200
 @@ -101,27 +101,13 @@
      udevadm control --reload
      wait_for_dev -n /dev/root
  
 -    if [ -z "$DRACUT_SYSTEMD" ]; then
--        type write_fs_tab > /dev/null 2>&1 || . /lib/fs-lib.sh
-+    type write_fs_tab > /dev/null 2>&1 || . /lib/fs-lib.sh
+-        command -v write_fs_tab > /dev/null || . /lib/fs-lib.sh
++    command -v write_fs_tab > /dev/null || . /lib/fs-lib.sh
  
 -        write_fs_tab /dev/root "$nbdfstype" "$fsopts"
 +    write_fs_tab /dev/root "$nbdfstype" "$fsopts"
@@ -1233,9 +1217,9 @@ diff -ur dracut-ng-105.orig/modules.d/95nbd/nbdroot.sh dracut-ng-105/modules.d/9
  fi
  
  if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then
-diff -ur dracut-ng-105.orig/modules.d/95resume/module-setup.sh dracut-ng-105/modules.d/95resume/module-setup.sh
---- dracut-ng-105.orig/modules.d/95resume/module-setup.sh      2024-12-05 17:04:51.693285823 +0100
-+++ dracut-ng-105/modules.d/95resume/module-setup.sh   2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95resume/module-setup.sh dracut-ng-106/modules.d/95resume/module-setup.sh
+--- dracut-ng-106.orig/modules.d/95resume/module-setup.sh      2025-04-19 11:24:06.833185848 +0200
++++ dracut-ng-106/modules.d/95resume/module-setup.sh   2025-04-19 11:33:29.738463002 +0200
 @@ -58,16 +58,6 @@
          [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf"
      fi
@@ -1266,9 +1250,9 @@ diff -ur dracut-ng-105.orig/modules.d/95resume/module-setup.sh dracut-ng-105/mod
  
      inst_script "$moddir/resume.sh" /lib/dracut/resume.sh
  }
-diff -ur dracut-ng-105.orig/modules.d/95rootfs-block/module-setup.sh dracut-ng-105/modules.d/95rootfs-block/module-setup.sh
---- dracut-ng-105.orig/modules.d/95rootfs-block/module-setup.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95rootfs-block/module-setup.sh     2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95rootfs-block/module-setup.sh dracut-ng-106/modules.d/95rootfs-block/module-setup.sh
+--- dracut-ng-106.orig/modules.d/95rootfs-block/module-setup.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95rootfs-block/module-setup.sh     2025-04-19 11:33:29.738463002 +0200
 @@ -75,11 +75,9 @@
  
      inst_multiple umount
@@ -1284,9 +1268,9 @@ diff -ur dracut-ng-105.orig/modules.d/95rootfs-block/module-setup.sh dracut-ng-1
  
      inst_hook initqueue/timeout 99 "$moddir/rootfallback.sh"
  
-diff -ur dracut-ng-105.orig/modules.d/95udev-rules/module-setup.sh dracut-ng-105/modules.d/95udev-rules/module-setup.sh
---- dracut-ng-105.orig/modules.d/95udev-rules/module-setup.sh  2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/95udev-rules/module-setup.sh       2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/95udev-rules/module-setup.sh dracut-ng-106/modules.d/95udev-rules/module-setup.sh
+--- dracut-ng-106.orig/modules.d/95udev-rules/module-setup.sh  2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/95udev-rules/module-setup.sh       2025-04-19 11:33:29.738463002 +0200
 @@ -9,18 +9,13 @@
      # of the rules we want so that we just copy those in would be best
      inst_multiple udevadm cat uname blkid
@@ -1309,9 +1293,9 @@ diff -ur dracut-ng-105.orig/modules.d/95udev-rules/module-setup.sh dracut-ng-105
          exit 1
      fi
  
-diff -ur dracut-ng-105.orig/modules.d/98usrmount/module-setup.sh dracut-ng-105/modules.d/98usrmount/module-setup.sh
---- dracut-ng-105.orig/modules.d/98usrmount/module-setup.sh    2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/98usrmount/module-setup.sh 2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/98usrmount/module-setup.sh dracut-ng-106/modules.d/98usrmount/module-setup.sh
+--- dracut-ng-106.orig/modules.d/98usrmount/module-setup.sh    2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/98usrmount/module-setup.sh 2025-04-19 11:33:29.738463002 +0200
 @@ -13,8 +13,6 @@
  
  # called by dracut
@@ -1322,9 +1306,9 @@ diff -ur dracut-ng-105.orig/modules.d/98usrmount/module-setup.sh dracut-ng-105/m
 +    inst_hook pre-pivot 50 "$moddir/mount-usr.sh"
      :
  }
-diff -ur dracut-ng-105.orig/modules.d/99base/dracut-dev-lib.sh dracut-ng-105/modules.d/99base/dracut-dev-lib.sh
---- dracut-ng-105.orig/modules.d/99base/dracut-dev-lib.sh      2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/99base/dracut-dev-lib.sh   2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/99base/dracut-dev-lib.sh dracut-ng-106/modules.d/99base/dracut-dev-lib.sh
+--- dracut-ng-106.orig/modules.d/99base/dracut-dev-lib.sh      2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/99base/dracut-dev-lib.sh   2025-04-19 11:33:29.738463002 +0200
 @@ -25,11 +25,6 @@
  dev_unit_name() {
      local dev="$1"
@@ -1410,18 +1394,18 @@ diff -ur dracut-ng-105.orig/modules.d/99base/dracut-dev-lib.sh dracut-ng-105/mod
 -        /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
 -    fi
  }
-diff -ur dracut-ng-105.orig/modules.d/99base/dracut-lib.sh dracut-ng-105/modules.d/99base/dracut-lib.sh
---- dracut-ng-105.orig/modules.d/99base/dracut-lib.sh  2024-12-05 17:04:51.697285886 +0100
-+++ dracut-ng-105/modules.d/99base/dracut-lib.sh       2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/99base/dracut-lib.sh dracut-ng-106/modules.d/99base/dracut-lib.sh
+--- dracut-ng-106.orig/modules.d/99base/dracut-lib.sh  2025-04-19 11:27:11.221604182 +0200
++++ dracut-ng-106/modules.d/99base/dracut-lib.sh       2025-04-19 11:33:29.738463002 +0200
 @@ -2,7 +2,6 @@
  
- type wait_for_dev > /dev/null 2>&1 || . /lib/dracut-dev-lib.sh
+ command -v wait_for_dev > /dev/null || . /lib/dracut-dev-lib.sh
  
 -export DRACUT_SYSTEMD
  export NEWROOT
  if [ -n "$NEWROOT" ]; then
      [ -d "$NEWROOT" ] || mkdir -p -m 0755 "$NEWROOT"
-@@ -65,33 +64,19 @@
+@@ -64,33 +63,19 @@
      printf "%s" "$var"
  }
  
@@ -1467,7 +1451,7 @@ diff -ur dracut-ng-105.orig/modules.d/99base/dracut-lib.sh dracut-ng-105/modules
  
  vwarn() {
      while read -r line || [ -n "$line" ]; do
-@@ -450,10 +435,6 @@
+@@ -423,10 +408,6 @@
          source_hook "shutdown-emergency"
      fi
  
@@ -1478,7 +1462,7 @@ diff -ur dracut-ng-105.orig/modules.d/99base/dracut-lib.sh dracut-ng-105/modules
      exit 1
  }
  
-@@ -910,43 +891,35 @@
+@@ -835,43 +816,35 @@
  
  _emergency_shell() {
      local _name="$1"
@@ -1549,10 +1533,10 @@ diff -ur dracut-ng-105.orig/modules.d/99base/dracut-lib.sh dracut-ng-105/modules
  }
  
  emergency_shell() {
-diff -ur dracut-ng-105.orig/modules.d/99base/init.sh dracut-ng-105/modules.d/99base/init.sh
---- dracut-ng-105.orig/modules.d/99base/init.sh        2024-12-05 17:04:51.697285886 +0100
-+++ dracut-ng-105/modules.d/99base/init.sh     2024-12-05 17:05:26.429833500 +0100
-@@ -145,7 +145,7 @@
+diff -ur dracut-ng-106.orig/modules.d/99base/init.sh dracut-ng-106/modules.d/99base/init.sh
+--- dracut-ng-106.orig/modules.d/99base/init.sh        2025-04-19 11:27:11.221604182 +0200
++++ dracut-ng-106/modules.d/99base/init.sh     2025-04-19 11:33:29.738463002 +0200
+@@ -147,7 +147,7 @@
      && UDEV_LOG=debug
  
  # start up udev and trigger cold plugs
@@ -1561,10 +1545,10 @@ diff -ur dracut-ng-105.orig/modules.d/99base/init.sh dracut-ng-105/modules.d/99b
  
  UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
  
-diff -ur dracut-ng-105.orig/modules.d/99base/module-setup.sh dracut-ng-105/modules.d/99base/module-setup.sh
---- dracut-ng-105.orig/modules.d/99base/module-setup.sh        2024-12-05 17:04:51.737286516 +0100
-+++ dracut-ng-105/modules.d/99base/module-setup.sh     2024-12-05 17:05:26.429833500 +0100
-@@ -50,11 +50,9 @@
+diff -ur dracut-ng-106.orig/modules.d/99base/module-setup.sh dracut-ng-106/modules.d/99base/module-setup.sh
+--- dracut-ng-106.orig/modules.d/99base/module-setup.sh        2025-04-19 11:28:05.105726430 +0200
++++ dracut-ng-106/modules.d/99base/module-setup.sh     2025-04-19 11:33:29.738463002 +0200
+@@ -70,11 +70,9 @@
      inst_simple "$moddir/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
      mkdir -p "${initdir}"/var
  
@@ -1579,8 +1563,8 @@ diff -ur dracut-ng-105.orig/modules.d/99base/module-setup.sh dracut-ng-105/modul
  
      ln -fs /proc/self/mounts "$initdir/etc/mtab"
      if [[ $ro_mnt == yes ]]; then
-@@ -100,11 +98,8 @@
-         if [[ -n ${host_devs[*]} ]]; then
+@@ -95,11 +93,8 @@
+         if [[ -n ${host_devs[*]} ]] || [[ -n ${user_devs[*]} ]]; then
              dracut_need_initqueue
          fi
 -        if [[ -f $initdir/lib/dracut/need-initqueue ]] || ! dracut_module_included "systemd"; then
@@ -1592,9 +1576,9 @@ diff -ur dracut-ng-105.orig/modules.d/99base/module-setup.sh dracut-ng-105/modul
                  export PREFIX="$initdir"
                  export hookdir=/lib/dracut/hooks
  
-diff -ur dracut-ng-105.orig/modules.d/99shutdown/shutdown.sh dracut-ng-105/modules.d/99shutdown/shutdown.sh
---- dracut-ng-105.orig/modules.d/99shutdown/shutdown.sh        2024-10-13 14:10:54.000000000 +0200
-+++ dracut-ng-105/modules.d/99shutdown/shutdown.sh     2024-12-05 17:05:26.429833500 +0100
+diff -ur dracut-ng-106.orig/modules.d/99shutdown/shutdown.sh dracut-ng-106/modules.d/99shutdown/shutdown.sh
+--- dracut-ng-106.orig/modules.d/99shutdown/shutdown.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/99shutdown/shutdown.sh     2025-04-19 11:33:29.738463002 +0200
 @@ -149,12 +149,6 @@
  done
  [ $_cnt -ge 40 ] && _check_shutdown final

diff --git a/proc_sys_remount.patch b/proc_sys_remount.patch
index 99b6601283fa77ce7f303aa4fd644cdef9b881fc..cbc59e9cce0a3610759d2f3d877b91d1a3793a17 100644 (file)
--- a/proc_sys_remount.patch
+++ b/proc_sys_remount.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-ng-105.orig/modules.d/99base/init.sh dracut-ng-105/modules.d/99base/init.sh
---- dracut-ng-105.orig/modules.d/99base/init.sh        2024-12-05 16:24:58.567508776 +0100
-+++ dracut-ng-105/modules.d/99base/init.sh     2024-12-05 16:25:10.035689277 +0100
-@@ -275,6 +275,26 @@
+diff -ur dracut-ng-106.orig/modules.d/99base/init.sh dracut-ng-106/modules.d/99base/init.sh
+--- dracut-ng-106.orig/modules.d/99base/init.sh        2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/99base/init.sh     2025-04-19 11:25:49.925419741 +0200
+@@ -277,6 +277,26 @@
  source_hook cleanup
  
  # By the time we get here, the root filesystem should be mounted.

diff --git a/update-initramfs b/update-initramfs
index d520b3c463b8bc300ada8a9d29f7597f475a1f3e..275c84f15f7a8fb3fda79a6a812c336d9422a702 100755 (executable)
--- a/update-initramfs
+++ b/update-initramfs
@@ -23,7 +23,7 @@ if [ "x${1}" = "x" ]; then
   echo "Usage: update-initramfs <all | kernel version>"
   echo "Examples:"
   echo "  update-initramfs all"
-  echo "  update-initramfs 5.10.138-5.10-1"
+  echo "  update-initramfs 6.12.23-1"
   exit 0
 elif [ "x${1}" = "xall" ]; then
   for kernel in $(/bin/ls -1 /lib/modules/ 2>/dev/null); do