- switched to dracut-ng, updated to 105

diff --git a/arch-libdir.patch b/arch-libdir.patch
index 86126db043d50496a6d4c7aed6c9013558960bd2..e6c6d0cbc57ade56beb9f402ef60f646d4e09891 100644 (file)
--- a/arch-libdir.patch
+++ b/arch-libdir.patch
@@ -1,6 +1,7 @@
---- dracut-056/modules.d/95resume/module-setup.sh.orig 2022-05-07 19:58:20.569138739 +0200
-+++ dracut-056/modules.d/95resume/module-setup.sh      2022-05-07 20:02:27.501134327 +0200
-@@ -50,7 +50,7 @@ install() {
+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-10-13 14:10:54.000000000 +0200
++++ dracut-ng-105/modules.d/95resume/module-setup.sh   2024-12-05 16:18:53.721766404 +0100
+@@ -69,7 +69,7 @@

      fi
  
      # Optional uswsusp support
      fi
  
      # Optional uswsusp support

diff --git a/bash.patch b/bash.patch
index 4c56e4da9b70e9a9b8b1bbea21d4c09d1847392b..97d88ecd5e690d6bf3600529b1c8a8bd28890a0f 100644 (file)
--- a/bash.patch
+++ b/bash.patch
@@ -1,19 +1,21 @@
---- dracut-055/modules.d/00bash/module-setup.sh~       2021-05-27 14:34:19.000000000 +0200
-+++ dracut-055/modules.d/00bash/module-setup.sh        2021-10-30 23:03:00.931687353 +0200
-@@ -9,7 +9,7 @@
+diff -ur dracut-ng-105.orig/modules.d/00bash/module-setup.sh dracut-ng-105/modules.d/00bash/module-setup.sh
+--- dracut-ng-105.orig/modules.d/00bash/module-setup.sh        2024-12-05 16:29:03.063356955 +0100
++++ dracut-ng-105/modules.d/00bash/module-setup.sh     2024-12-05 16:30:47.969014510 +0100
+@@ -6,9 +6,7 @@
+ check() {
+     # If the binary(s) requirements are not fulfilled the module can't be installed.

      require_binaries bash || return 1
      require_binaries bash || return 1

- 
-     # Return 255 to only include the module, if another module requires it.
+-
+-    # Return 255 to only include the module, if another module requires it.

 -    return 255
 +    return 0
 -    return 255
 +    return 0

- 

  }
  
  }
  

-@@ -27,6 +27,6 @@
+ # Install the required file(s) and directories for the module in the initramfs.
+@@ -16,5 +14,5 @@

      inst /bin/bash
  
      # Prefer bash as default shell if no other shell is preferred.
 -    [[ -L $initdir/bin/sh ]] || ln -sf bash "${initdir}/bin/sh"
 +    ln -sf bash "${initdir}/bin/sh"
      inst /bin/bash
  
      # Prefer bash as default shell if no other shell is preferred.
 -    [[ -L $initdir/bin/sh ]] || ln -sf bash "${initdir}/bin/sh"
 +    ln -sf bash "${initdir}/bin/sh"

- 

  }
  }

diff --git a/compressors.patch b/compressors.patch
index a6d6b96bb8a9dcadbd2cc82d07299226b123924a..620ae54d04808a019fd45474c16dcc12ec5f1ba2 100644 (file)
--- a/compressors.patch
+++ b/compressors.patch
@@ -1,7 +1,7 @@
-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
+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 @@

                          Install the space separated list of files into the
                           initramfs, if they exist.
    --gzip                Compress the generated initramfs using gzip.
                          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 -urpa dracut-059.orig/dracut.sh dracut-059/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.
    --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.

-@@ -229,6 +227,8 @@ Creates initial ramdisk images for prelo
+@@ -233,6 +231,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.
                           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,12 +19,12 @@ diff -urpa dracut-059.orig/dracut.sh dracut-059/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.
                           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.

-@@ -2507,7 +2507,7 @@ fi
+@@ -2411,7 +2411,7 @@

  
  if ! [[ $compress ]]; then
      # check all known compressors, if none specified
  
  if ! [[ $compress ]]; then
      # check all known compressors, if none specified

--    for i in $DRACUT_COMPRESS_PIGZ $DRACUT_COMPRESS_GZIP $DRACUT_COMPRESS_LZ4 $DRACUT_COMPRESS_LZOP $DRACUT_COMPRESS_ZSTD $DRACUT_COMPRESS_LZMA $DRACUT_COMPRESS_XZ $DRACUT_COMPRESS_LBZIP2 $DRACUT_COMPRESS_BZIP2 $DRACUT_COMPRESS_CAT; do
-+    for i in $DRACUT_COMPRESS_XZ $DRACUT_COMPRESS_LZMA $DRACUT_COMPRESS_BZIP2 $DRACUT_COMPRESS_LBZIP2 $DRACUT_COMPRESS_GZIP $DRACUT_COMPRESS_PIGZ $DRACUT_COMPRESS_LZ4 $DRACUT_COMPRESS_LZOP $DRACUT_COMPRESS_ZSTD $DRACUT_COMPRESS_CAT; do
-         [[ $i != "$DRACUT_COMPRESS_ZSTD" || $DRACUT_KERNEL_RD_ZSTD ]] || continue
+-    for i in $DRACUT_COMPRESS_ZSTD $DRACUT_COMPRESS_PIGZ $DRACUT_COMPRESS_GZIP $DRACUT_COMPRESS_LZ4 $DRACUT_COMPRESS_LZOP $DRACUT_COMPRESS_LZMA $DRACUT_COMPRESS_XZ $DRACUT_COMPRESS_LBZIP2 $DRACUT_COMPRESS_BZIP2 $DRACUT_COMPRESS_CAT; do
++    for i in $DRACUT_COMPRESS_XZ $DRACUT_COMPRESS_LZMA $DRACUT_COMPRESS_BZIP2 $DRACUT_COMPRESS_LBZIP2 $DRACUT_COMPRESS_GZIP $DRACUT_COMPRESS_PIGZ $DRACUT_COMPRESS_LZ4 $DRACUT_COMPRESS_ZSTD $DRACUT_COMPRESS_LZOP $DRACUT_COMPRESS_CAT; do

          command -v "$i" &> /dev/null || continue
          command -v "$i" &> /dev/null || continue

+         check_kernel_compress_support "$i" || continue

          compress="$i"
          compress="$i"

diff --git a/crypttab-keyscript.patch b/crypttab-keyscript.patch
index a857794d037f69f0afd7e0b2ee74093fde9fe6df..31af9993c2a0f6c15ba23569a3012687f182a72c 100644 (file)
--- a/crypttab-keyscript.patch
+++ b/crypttab-keyscript.patch
@@ -1,7 +1,7 @@
-diff -urpa dracut-056.orig/modules.d/90crypt/cryptroot-ask.sh dracut-056/modules.d/90crypt/cryptroot-ask.sh
---- dracut-056.orig/modules.d/90crypt/cryptroot-ask.sh 2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90crypt/cryptroot-ask.sh      2022-08-28 19:27:11.079536407 +0200
-@@ -112,6 +112,9 @@ while [ $# -gt 0 ]; do
+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
+@@ -112,6 +112,9 @@

          header=*)
              cryptsetupopts="${cryptsetupopts} --${1}"
              ;;
          header=*)
              cryptsetupopts="${cryptsetupopts} --${1}"
              ;;


@@ -11,7 +11,7 @@ diff -urpa dracut-056.orig/modules.d/90crypt/cryptroot-ask.sh dracut-056/modules
      esac
      shift
  done
      esac
      shift
  done

-@@ -174,6 +177,15 @@ else
+@@ -174,6 +177,15 @@

      done
  fi
  
      done
  fi
  


@@ -26,11 +26,11 @@ diff -urpa dracut-056.orig/modules.d/90crypt/cryptroot-ask.sh dracut-056/modules
 +
  if [ $ask_passphrase -ne 0 ]; then
      luks_open="$(command -v cryptsetup) $cryptsetupopts luksOpen"
 +
  if [ $ask_passphrase -ne 0 ]; then
      luks_open="$(command -v cryptsetup) $cryptsetupopts luksOpen"

-     _timeout=$(getargs "rd.luks.timeout")
-diff -urpa dracut-056.orig/modules.d/90crypt/module-setup.sh dracut-056/modules.d/90crypt/module-setup.sh
---- dracut-056.orig/modules.d/90crypt/module-setup.sh  2022-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/90crypt/module-setup.sh       2022-08-28 19:27:11.079536407 +0200
-@@ -136,10 +136,26 @@ install() {
+     _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 @@

                          forceentry="yes"
                          break
                          ;;
                          forceentry="yes"
                          break
                          ;;

diff --git a/dracut.spec b/dracut.spec
index 72ffee6163226d2512d0818afbec955ccc286b68..0145dab22d93d81f744b8b2a1fe2373a993e7d94 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,26 +1,24 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut

-Version:       059
-Release:       2
+Version:       105
+Release:       1

 License:       GPL v2+
 Group:         Base
 License:       GPL v2+
 Group:         Base

-Source0:       https://github.com/dracutdevs/dracut/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: bce69baf6f633ecf84dea7e3bb63dd32
+Source0:       https://github.com/dracut-ng/dracut-ng/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 2b001f101c067e3ccd1cca6216e665e1

 Source1:       tld.conf
 Source2:       update-initramfs
 Source1:       tld.conf
 Source2:       update-initramfs

-Patch1:                os-release.patch
-Patch2:                arch-libdir.patch
-Patch3:                config.patch
-Patch4:                compressors.patch
-Patch5:                proc_sys_remount.patch
-Patch6:                misc_fixes.patch
-Patch7:                initrd-release.patch
-Patch8:                crypttab-keyscript.patch
-Patch9:                bash.patch
-Patch10:       microcode-check.patch
+Patch1:                arch-libdir.patch
+Patch2:                config.patch
+Patch3:                compressors.patch
+Patch4:                proc_sys_remount.patch
+Patch5:                misc_fixes.patch
+Patch6:                initrd-release.patch
+Patch7:                crypttab-keyscript.patch
+Patch8:                bash.patch

 Patch100:      no_systemd.patch
 Patch100:      no_systemd.patch

-URL:           https://github.com/dracutdevs/dracut/wiki/
+URL:           https://github.com/dracut-ng/dracut-ng/wiki

 BuildRequires: asciidoc
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml
 BuildRequires: asciidoc
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml


@@ -69,6 +67,7 @@ Suggests:     multipath-tools
 Suggests:      suspend-utils
 Suggests:      syslogdaemon
 Suggests:      xfsprogs
 Suggests:      suspend-utils
 Suggests:      syslogdaemon
 Suggests:      xfsprogs

+Suggests:      xz

 Conflicts:     kmod < 6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Conflicts:     kmod < 6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -181,7 +180,7 @@ bash-completion for dracut.
 Bashowe dopełnianie składni dla polecenia dracut.
 
 %prep
 Bashowe dopełnianie składni dla polecenia dracut.
 
 %prep

-%setup -q
+%setup -q -n dracut-ng-%{version}

 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1


@@ -190,8 +189,6 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1

-%patch9 -p1
-%patch10 -p1

 %patch100 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
 %patch100 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh


@@ -216,7 +213,6 @@ install -d $RPM_BUILD_ROOT{/boot/dracut,/sbin} \
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-initramfs
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-initramfs

-install -p dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf

 
 echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT%{dracutlibdir}/dracut-version.sh
 
 
 echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT%{dracutlibdir}/dracut-version.sh
 


@@ -229,19 +225,55 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 %endif
 
 # modules used by dracut tests
 %endif
 
 # modules used by dracut tests

+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/test{,-makeroot,-root}

 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/80test{,-makeroot,-root}
 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/80test{,-makeroot,-root}

+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/test
+
+%ifnarch s390 s390x
+# remove architecture specific modules
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/80cms
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/81cio_ignore
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/91zipl
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd_mod
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dcssblk
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95zfcp
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95znet
+%else
+%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00warpclock
+%endif

 
 

-# 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/{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}
+# 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/usr/lib/kernel/install.d/*.install
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8
 
 # remove unneded files
 %{__rm} -r $RPM_BUILD_ROOT/usr/lib/kernel/install.d/*.install

+%{__rm} -r $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d/*.example

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -259,6 +291,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/update-initramfs
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/dracut.conf.d
 %attr(755,root,root) %{_bindir}/update-initramfs
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/dracut.conf.d

+%{dracutlibdir}/dracut.conf.d/generic
+%{dracutlibdir}/dracut.conf.d/hostonly
+%{dracutlibdir}/dracut.conf.d/ima
+%{dracutlibdir}/dracut.conf.d/no-network
+%{dracutlibdir}/dracut.conf.d/no-xattr
+%{dracutlibdir}/dracut.conf.d/rescue
+%{dracutlibdir}/dracut.conf.d/uki-virt

 %attr(755,root,root) %{dracutlibdir}/dracut-install
 %attr(755,root,root) %{dracutlibdir}/dracut-util
 %dir %{dracutlibdir}/modules.d
 %attr(755,root,root) %{dracutlibdir}/dracut-install
 %attr(755,root,root) %{dracutlibdir}/dracut-util
 %dir %{dracutlibdir}/modules.d


@@ -271,8 +310,8 @@ 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
 %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/00mksh
-%attr(755,root,root) %{dracutlibdir}/modules.d/00mksh/module-setup.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
 %dir %{dracutlibdir}/modules.d/00warpclock
 %attr(755,root,root) %{dracutlibdir}/modules.d/00warpclock/*.sh
 %dir %{dracutlibdir}/modules.d/03modsign


@@ -283,8 +322,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog/*.sh
 %dir %{dracutlibdir}/modules.d/04watchdog-modules
 %attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog-modules/module-setup.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog/*.sh
 %dir %{dracutlibdir}/modules.d/04watchdog-modules
 %attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog-modules/module-setup.sh

-%dir %{dracutlibdir}/modules.d/05busybox
-%attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.sh

 %dir %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/10i18n/README
 %{dracutlibdir}/modules.d/10i18n/*.rules
 %dir %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/10i18n/README
 %{dracutlibdir}/modules.d/10i18n/*.rules


@@ -293,10 +330,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %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/80cms
-%attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh
-%dir %{dracutlibdir}/modules.d/81cio_ignore
-%attr(755,root,root) %{dracutlibdir}/modules.d/81cio_ignore/*.sh

 %dir %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh


@@ -326,10 +359,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh
 %dir %{dracutlibdir}/modules.d/90multipath
 %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh
 %dir %{dracutlibdir}/modules.d/90multipath
 %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh

+%dir %{dracutlibdir}/modules.d/90numlock
+%attr(755,root,root) %{dracutlibdir}/modules.d/90numlock/*.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/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/90pcmcia
+%attr(755,root,root) %{dracutlibdir}/modules.d/90pcmcia/module-setup.sh

 %dir %{dracutlibdir}/modules.d/90qemu
 %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
 %dir %{dracutlibdir}/modules.d/90qemu
 %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg


@@ -337,24 +374,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-loop
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-loop
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh

-%dir %{dracutlibdir}/modules.d/91zipl
-%attr(755,root,root) %{dracutlibdir}/modules.d/91zipl/*.sh
-%dir %{dracutlibdir}/modules.d/95dcssblk
-%attr(755,root,root) %{dracutlibdir}/modules.d/95dcssblk/*.sh

 %dir %{dracutlibdir}/modules.d/95debug
 %attr(755,root,root) %{dracutlibdir}/modules.d/95debug/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
 %attr(755,root,root) %{dracutlibdir}/modules.d/95debug/*.sh

+%dir %{dracutlibdir}/modules.d/95hwdb
+%attr(755,root,root) %{dracutlibdir}/modules.d/95hwdb/module-setup.sh

 %dir %{dracutlibdir}/modules.d/95lunmask
 %attr(755,root,root) %{dracutlibdir}/modules.d/95lunmask/*.sh
 %dir %{dracutlibdir}/modules.d/95resume
 %attr(755,root,root) %{dracutlibdir}/modules.d/95resume/*.sh
 %dir %{dracutlibdir}/modules.d/95rootfs-block
 %dir %{dracutlibdir}/modules.d/95lunmask
 %attr(755,root,root) %{dracutlibdir}/modules.d/95lunmask/*.sh
 %dir %{dracutlibdir}/modules.d/95resume
 %attr(755,root,root) %{dracutlibdir}/modules.d/95resume/*.sh
 %dir %{dracutlibdir}/modules.d/95rootfs-block

+%attr(755,root,root) %{dracutlibdir}/modules.d/95rootfs-block/*.rules

 %attr(755,root,root) %{dracutlibdir}/modules.d/95rootfs-block/*.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/95rootfs-block/*.sh

-%dir %{dracutlibdir}/modules.d/95dasd
-%attr(755,root,root) %{dracutlibdir}/modules.d/95dasd/*.sh
-%dir %{dracutlibdir}/modules.d/95dasd_mod
-%attr(755,root,root) %{dracutlibdir}/modules.d/95dasd_mod/*.sh
-%dir %{dracutlibdir}/modules.d/95dasd_rules
-%attr(755,root,root) %{dracutlibdir}/modules.d/95dasd_rules/*.sh

 %dir %{dracutlibdir}/modules.d/95fcoe-uefi
 %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe-uefi/*.sh
 %dir %{dracutlibdir}/modules.d/95fstab-sys
 %dir %{dracutlibdir}/modules.d/95fcoe-uefi
 %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe-uefi/*.sh
 %dir %{dracutlibdir}/modules.d/95fstab-sys


@@ -362,18 +392,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dracutlibdir}/modules.d/95nvmf
 %attr(755,root,root) %{dracutlibdir}/modules.d/95nvmf/*.sh
 %{dracutlibdir}/modules.d/95nvmf/95-nvmf-initqueue.rules
 %dir %{dracutlibdir}/modules.d/95nvmf
 %attr(755,root,root) %{dracutlibdir}/modules.d/95nvmf/*.sh
 %{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/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
-%attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp_rules/*.sh

 %dir %{dracutlibdir}/modules.d/95terminfo
 %attr(755,root,root) %{dracutlibdir}/modules.d/95terminfo/*.sh
 %dir %{dracutlibdir}/modules.d/95udev-rules
 %dir %{dracutlibdir}/modules.d/95terminfo
 %attr(755,root,root) %{dracutlibdir}/modules.d/95terminfo/*.sh
 %dir %{dracutlibdir}/modules.d/95udev-rules

-%{dracutlibdir}/modules.d/95udev-rules/*.rules

 %attr(755,root,root) %{dracutlibdir}/modules.d/95udev-rules/*.sh
 %dir %{dracutlibdir}/modules.d/95virtfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/95virtfs/*.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/95udev-rules/*.sh
 %dir %{dracutlibdir}/modules.d/95virtfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/95virtfs/*.sh


@@ -402,14 +425,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh
 %dir %{dracutlibdir}/modules.d/99base
 %attr(755,root,root) %{dracutlibdir}/modules.d/99base/*.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh
 %dir %{dracutlibdir}/modules.d/99base
 %attr(755,root,root) %{dracutlibdir}/modules.d/99base/*.sh

+%dir %{dracutlibdir}/modules.d/99busybox
+%attr(755,root,root) %{dracutlibdir}/modules.d/99busybox/module-setup.sh

 %dir %{dracutlibdir}/modules.d/99fs-lib
 %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/99shutdown
 %attr(755,root,root) %{dracutlibdir}/modules.d/99shutdown/*.sh
 %dir %{dracutlibdir}/modules.d/99fs-lib
 %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/99shutdown
 %attr(755,root,root) %{dracutlibdir}/modules.d/99shutdown/*.sh

-%dir %{dracutlibdir}/modules.d/99squash
-%attr(755,root,root) %{dracutlibdir}/modules.d/99squash/*.sh

 %dir %{dracutlibdir}/modules.d/99uefi-lib
 %attr(755,root,root) %{dracutlibdir}/modules.d/99uefi-lib/*.sh
 %attr(755,root,root) %{dracutlibdir}/dracut-version.sh
 %dir %{dracutlibdir}/modules.d/99uefi-lib
 %attr(755,root,root) %{dracutlibdir}/modules.d/99uefi-lib/*.sh
 %attr(755,root,root) %{dracutlibdir}/dracut-version.sh


@@ -427,9 +450,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/dracut.modules.7*
 %{_mandir}/man8/dracut.8*
 
 %{_mandir}/man7/dracut.modules.7*
 %{_mandir}/man8/dracut.8*
 

-#/usr/lib/kernel/install.d/50-dracut.install
-#/usr/lib/kernel/install.d/51-dracut-rescue.install
-

 %files network
 %defattr(644,root,root,755)
 %dir %{dracutlibdir}/modules.d/35network-legacy
 %files network
 %defattr(644,root,root,755)
 %dir %{dracutlibdir}/modules.d/35network-legacy


@@ -437,8 +457,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/35network-legacy/*.sh
 %dir %{dracutlibdir}/modules.d/40network
 %attr(755,root,root) %{dracutlibdir}/modules.d/40network/*.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/35network-legacy/*.sh
 %dir %{dracutlibdir}/modules.d/40network
 %attr(755,root,root) %{dracutlibdir}/modules.d/40network/*.sh

-%dir %{dracutlibdir}/modules.d/45ifcfg
-%attr(755,root,root) %{dracutlibdir}/modules.d/45ifcfg/*.sh
+%dir %{dracutlibdir}/modules.d/45net-lib
+%attr(755,root,root) %{dracutlibdir}/modules.d/45net-lib/*.sh

 %dir %{dracutlibdir}/modules.d/45url-lib
 %attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh
 %dir %{dracutlibdir}/modules.d/90kernel-network-modules
 %dir %{dracutlibdir}/modules.d/45url-lib
 %attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh
 %dir %{dracutlibdir}/modules.d/90kernel-network-modules


@@ -463,14 +483,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/95nfs/*.sh
 %dir %{dracutlibdir}/modules.d/95ssh-client
 %attr(755,root,root) %{dracutlibdir}/modules.d/95ssh-client/*.sh
 %attr(755,root,root) %{dracutlibdir}/modules.d/95nfs/*.sh
 %dir %{dracutlibdir}/modules.d/95ssh-client
 %attr(755,root,root) %{dracutlibdir}/modules.d/95ssh-client/*.sh

-%dir %{dracutlibdir}/modules.d/95znet
-%attr(755,root,root) %{dracutlibdir}/modules.d/95znet/*.sh

 
 %files fips
 %defattr(644,root,root,755)
 %dir %{dracutlibdir}/modules.d/01fips
 %attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh
 
 %files fips
 %defattr(644,root,root,755)
 %dir %{dracutlibdir}/modules.d/01fips
 %attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh

-%config(noreplace) %{_sysconfdir}/dracut.conf.d/40-fips.conf
+%dir %{dracutlibdir}/modules.d/01fips-crypto-policies
+%attr(755,root,root) %{dracutlibdir}/modules.d/01fips-crypto-policies/*.sh
+%{dracutlibdir}/dracut.conf.d/fips

 
 %files caps
 %defattr(644,root,root,755)
 
 %files caps
 %defattr(644,root,root,755)

diff --git a/initrd-release.patch b/initrd-release.patch
index a961195a0208cb718cd6c9cbd8ad9794e7007a52..2271e4a6b87072f5d8689d6e5b84d331b514dff9 100644 (file)
--- a/initrd-release.patch
+++ b/initrd-release.patch
@@ -1,19 +1,7 @@
-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
- 
--[ -f /usr/lib/initrd-release ] && . /usr/lib/initrd-release
-+[ -f /etc/initrd-release ] && . /etc/initrd-release
- [ -n "$VERSION" ] && info "dracut-$VERSION"
- 
- if ! getargbool 1 'rd.hostonly'; then
-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() {
+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 @@

  }
  
  setdebug() {
  }
  
  setdebug() {


@@ -22,10 +10,10 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/9
      if [ -z "$RD_DEBUG" ]; then
          if [ -e /proc/cmdline ]; then
              RD_DEBUG=no
      if [ -z "$RD_DEBUG" ]; then
          if [ -e /proc/cmdline ]; then
              RD_DEBUG=no

-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
+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 @@

      exec 0<> /dev/console 1<> /dev/console 2<> /dev/console
  fi
  
      exec 0<> /dev/console 1<> /dev/console 2<> /dev/console
  fi
  


@@ -34,10 +22,10 @@ diff -urpa dracut-059.orig/modules.d/99base/init.sh dracut-059/modules.d/99base/
  [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
  
  source_conf /etc/conf.d
  [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
  
  source_conf /etc/conf.d

-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() {
+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
      if [[ -e $dracutsysrootdir/etc/os-release ]]; then
          # shellcheck disable=SC1090
          . "$dracutsysrootdir"/etc/os-release


@@ -46,7 +34,7 @@ diff -urpa dracut-059.orig/modules.d/99base/module-setup.sh dracut-059/modules.d
          [[ -n ${VERSION} ]] && VERSION+=" "
          [[ -n ${PRETTY_NAME} ]] && PRETTY_NAME+=" "
      else
          [[ -n ${VERSION} ]] && VERSION+=" "
          [[ -n ${PRETTY_NAME} ]] && PRETTY_NAME+=" "
      else

-@@ -88,7 +88,7 @@ install() {
+@@ -80,7 +80,7 @@

              echo "ID=dracut"
              echo "VERSION_ID=\"$DRACUT_VERSION\""
              echo 'ANSI_COLOR="0;34"'
              echo "ID=dracut"
              echo "VERSION_ID=\"$DRACUT_VERSION\""
              echo 'ANSI_COLOR="0;34"'


@@ -55,7 +43,7 @@ diff -urpa dracut-059.orig/modules.d/99base/module-setup.sh dracut-059/modules.d
      fi
      VERSION+="dracut-$DRACUT_VERSION"
      PRETTY_NAME+="dracut-$DRACUT_VERSION (Initramfs)"
      fi
      VERSION+="dracut-$DRACUT_VERSION"
      PRETTY_NAME+="dracut-$DRACUT_VERSION (Initramfs)"

-@@ -99,10 +99,8 @@ install() {
+@@ -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}\""
          # 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/microcode-check.patch b/microcode-check.patch
deleted file mode 100644 (file)
index 6d3295c..0000000
--- a/microcode-check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
- 
- if [[ $early_microcode == yes ]]; then
-     if [[ $hostonly ]]; then
--        if [[ $(get_cpu_vendor) == "AMD" ]]; then
--            check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
--        elif [[ $(get_cpu_vendor) == "Intel" ]]; then
--            check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+        if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+            check_kernel_config CONFIG_MICROCODE || unset early_microcode
-         else
-             unset early_microcode
-         fi
-     else
--        ! check_kernel_config CONFIG_MICROCODE_AMD \
--            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+        ! check_kernel_config CONFIG_MICROCODE \
-             && unset early_microcode
-     fi
-     # Do not complain on non-x86 architectures as it makes no sense
-     case "${DRACUT_ARCH:-$(uname -m)}" in
-         x86_64 | i?86)
-             [[ $early_microcode != yes ]] \
--                && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+                && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
-             ;;
-         *) ;;
-     esac

diff --git a/misc_fixes.patch b/misc_fixes.patch
index 5358ba7f4ebb1b2d91e910c8f9d52404e5a058ce..f60d658dc8b020a60263f3e472932ec966c8a6ae 100644 (file)
--- a/misc_fixes.patch
+++ b/misc_fixes.patch
@@ -27,4 +27,3 @@ diff -urpa dracut-056.orig/modules.d/95terminfo/module-setup.sh dracut-056/modul
          done
      fi
  }
          done
      fi
  }

-Only in dracut-056.orig/modules.d/99base: init.sh.rej

diff --git a/no_systemd.patch b/no_systemd.patch
index f8c1f0672e3a1f0edd76e7f5740facfc878e6e6a..5193bf4593232d2f712f3e919b3e9d7011f1402e 100644 (file)
--- a/no_systemd.patch
+++ b/no_systemd.patch
@@ -1,27 +1,26 @@
-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
+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 @@

  is_qemu_virtualized() {
      # 0 if a virt environment was detected
      # 1 if a virt environment could not be detected
 -    # 255 if any error was encountered
 -    if type -P systemd-detect-virt > /dev/null 2>&1; then
  is_qemu_virtualized() {
      # 0 if a virt environment was detected
      # 1 if a virt environment could not be detected
 -    # 255 if any error was encountered
 -    if type -P systemd-detect-virt > /dev/null 2>&1; then

--        if ! vm=$(systemd-detect-virt --vm > /dev/null 2>&1); then
+-        if ! vm=$(systemd-detect-virt --vm 2> /dev/null); then

 -            return 255
 -        fi
 -        [[ $vm == "qemu" ]] && return 0
 -        [[ $vm == "kvm" ]] && return 0
 -        [[ $vm == "bochs" ]] && return 0
 -    fi
 -            return 255
 -        fi
 -        [[ $vm == "qemu" ]] && return 0
 -        [[ $vm == "kvm" ]] && return 0
 -        [[ $vm == "bochs" ]] && return 0
 -    fi

--
+ 

      for i in /sys/class/dmi/id/*_vendor; do
          [[ -f $i ]] || continue
      for i in /sys/class/dmi/id/*_vendor; do
          [[ -f $i ]] || continue

-         read -r vendor < "$i"
-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() {
+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
+@@ -142,16 +142,7 @@

      fi
  
      if ((sysloglvl > 0)); then
      fi
  
      if ((sysloglvl > 0)); then


@@ -39,257 +38,89 @@ diff -urpa dracut-059.orig/dracut-logger.sh dracut-059/dracut-logger.sh
              # We cannot log to syslog, so turn this facility off.
              kmsgloglvl=$sysloglvl
              sysloglvl=0
              # We cannot log to syslog, so turn this facility off.
              kmsgloglvl=$sysloglvl
              sysloglvl=0

-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
+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 @@

      . "$dracutbasedir"/dracut-version.sh
  fi
  
 -if systemd-detect-virt -c &> /dev/null; then
      . "$dracutbasedir"/dracut-version.sh
  fi
  
 -if systemd-detect-virt -c &> /dev/null; then

--    export DRACUT_NO_MKNOD=1 DRACUT_NO_XATTR=1
+-    export DRACUT_NO_MKNOD=1

 -    if [[ $hostonly ]]; then
 -    if [[ $hostonly ]]; then

--        printf "%s\n" "dracut: WARNING: running in hostonly mode in a container!!"
+-        printf "%s\n" "dracut[W]: Running in hostonly mode in a container!" >&2

 -    fi
 -fi
 -
  if [[ -f $dracutbasedir/dracut-init.sh ]]; then
      # shellcheck source=./dracut-init.sh
      . "$dracutbasedir"/dracut-init.sh
 -    fi
 -fi
 -
  if [[ -f $dracutbasedir/dracut-init.sh ]]; then
      # shellcheck source=./dracut-init.sh
      . "$dracutbasedir"/dracut-init.sh

-@@ -1389,19 +1382,6 @@ esac
- 
- abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
- 
--[[ -d $dracutsysrootdir$systemdutildir ]] \
--    || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2> /dev/null)
--
--if ! [[ -d $dracutsysrootdir$systemdutildir ]]; then
--    [[ -e $dracutsysrootdir/lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
--    [[ -e $dracutsysrootdir/usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
--fi
--
--[[ -d $dracutsysrootdir$systemdutilconfdir ]] \
--    || systemdutilconfdir=$(pkg-config systemd --variable=systemdutilconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemdutilconfdir ]] || systemdutilconfdir=/etc/systemd
--
- if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then
-     if ! [[ -f $srcmods/modules.dep ]]; then
-         if [[ -n "$(find "$srcmods" -name '*.ko*')" ]]; then
-@@ -1467,10 +1447,6 @@ if [[ ! $print_cmdline ]]; then
-         esac
- 
-         if ! [[ -s $uefi_stub ]]; then
--            uefi_stub="$dracutsysrootdir${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
--        fi
--
--        if ! [[ -s $uefi_stub ]]; then
-             dfatal "Can't find a uefi stub '$uefi_stub' to create a UEFI executable"
-             exit 1
-         fi
-@@ -1722,66 +1698,6 @@ for dev in "${!host_fs_types[@]}"; do
+@@ -1478,52 +1471,12 @@

      fi
      fi

- done
- 
--[[ -d $dracutsysrootdir$dbus ]] \
--    || dbus=$(pkg-config dbus --variable=dbus 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbus ]] || dbus=/usr/share/dbus-1
--
--[[ -d $dracutsysrootdir$dbusconfdir ]] \
--    || dbusconfdir=$(pkg-config dbus --variable=dbusconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbusconfdir ]] || dbusconfdir=/etc/dbus-1
--
--[[ -d $dracutsysrootdir$dbusinterfaces ]] \
--    || dbusinterfaces=$(pkg-config dbus --variable=dbusinterfaces 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbusinterfaces ]] || dbusinterfaces=${dbus}/interfaces
--
--[[ -d $dracutsysrootdir$dbusinterfacesconfdir ]] \
--    || dbusinterfacesconfdir=$(pkg-config dbus --variable=dbusinterfacesconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbusinterfacesconfdir ]] || dbusinterfacesconfdir=${dbusconfdir}/interfaces
--
--[[ -d $dracutsysrootdir$dbusservices ]] \
--    || dbusservices=$(pkg-config dbus --variable=dbusservices 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbusservices ]] || dbusservices=${dbus}/services
--
--[[ -d $dracutsysrootdir$dbusservicesconfdir ]] \
--    || dbusservicesconfdir=$(pkg-config dbus --variable=dbusservicesconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbusservicesconfdir ]] || dbusservicesconfdir=${dbusconfdir}/services
--
--[[ -d $dracutsysrootdir$dbussession ]] \
--    || dbussession=$(pkg-config dbus --variable=dbussession 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbussession ]] || dbussession=${dbus}/session.d
--
--[[ -d $dracutsysrootdir$dbussessionconfdir ]] \
--    || dbussessionconfdir=$(pkg-config dbus --variable=dbussessionconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbussessionconfdir ]] || dbussessionconfdir=${dbusconfdir}/session.d
--
--[[ -d $dracutsysrootdir$dbussystem ]] \
--    || dbussystem=$(pkg-config dbus --variable=dbussystem 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbussystem ]] || dbussystem=${dbus}/system.d
--
--[[ -d $dracutsysrootdir$dbussystemconfdir ]] \
--    || dbussystemconfdir=$(pkg-config dbus --variable=dbussystemconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbussystemconfdir ]] || dbussystemconfdir=${dbusconfdir}/system.d
--
--[[ -d $dracutsysrootdir$dbussystemservices ]] \
--    || dbussystemservices=$(pkg-config dbus --variable=dbussystemservices 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbussystemservices ]] || dbussystemservices=${dbus}/system-services
--
--[[ -d $dracutsysrootdir$dbussystemservicesconfdir ]] \
--    || dbussystemservicesconfdir=$(pkg-config dbus --variable=dbussystemservicesconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$dbussystemservicesconfdir ]] || dbussystemservicesconfdir=${dbusconfdir}/system-services
--
- [[ -d $dracutsysrootdir$udevdir ]] \
-     || udevdir="$(pkg-config udev --variable=udevdir 2> /dev/null)"
- if ! [[ -d $dracutsysrootdir$udevdir ]]; then
-@@ -1804,114 +1720,22 @@ fi
- 
- [[ -d $dracutsysrootdir$udevrulesconfdir ]] || udevrulesconfdir=${udevconfdir}/rules.d
- 
--[[ -d $dracutsysrootdir$sysctld ]] \
--    || sysctld=$(pkg-config systemd --variable=sysctld 2> /dev/null)
--
- [[ -d $dracutsysrootdir$sysctld ]] || sysctld=/usr/lib/sysctl.d
- 
--[[ -d $dracutsysrootdir$sysctlconfdir ]] \
--    || sysctlconfdir=$(pkg-config systemd --variable=sysctlconfdir 2> /dev/null)
--
- [[ -d $dracutsysrootdir$sysctlconfdir ]] || sysctlconfdir=/etc/sysctl.d
- 
--[[ -d $dracutsysrootdir$environment ]] \
--    || environment=$(pkg-config systemd --variable=environment 2> /dev/null)
--
- [[ -d $dracutsysrootdir$environment ]] || environment=/usr/lib/environment.d
- 
--[[ -d $dracutsysrootdir$environmentconfdir ]] \
--    || environmentconfdir=$(pkg-config systemd --variable=environmentconfdir 2> /dev/null)
--
- [[ -d $dracutsysrootdir$environmentconfdir ]] || environmentconfdir=/etc/environment.d
- 
--[[ -d $dracutsysrootdir$systemdcatalog ]] \
--    || systemdcatalog=$(pkg-config systemd --variable=systemdcatalog 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemdcatalog ]] || systemdcatalog=${systemdutildir}/catalog
--
--[[ -d $dracutsysrootdir$modulesload ]] \
--    || modulesload=$(pkg-config systemd --variable=modulesload 2> /dev/null)
--
- [[ -d $dracutsysrootdir$modulesload ]] || modulesload=/usr/lib/modules-load.d
- 
--[[ -d $dracutsysrootdir$modulesloadconfdir ]] \
--    || modulesloadconfdir=$(pkg-config systemd --variable=modulesloadconfdir 2> /dev/null)
--
- [[ -d $dracutsysrootdir$modulesloadconfdir ]] || modulesloadconfdir=/etc/modules-load.d
- 
--[[ -d $dracutsysrootdir$systemdnetwork ]] \
--    || systemdnetwork=$(pkg-config systemd --variable=systemdnetwork 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemdnetwork ]] || systemdnetwork=${systemdutildir}/network
--
--[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] \
--    || systemdnetworkconfdir=$(pkg-config systemd --variable=systemdnetworkconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdutilconfdir}/network
--
--[[ -d $dracutsysrootdir$systemdntpunits ]] \
--    || systemdntpunits=$(pkg-config systemd --variable=systemdntpunits 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemdntpunits ]] || systemdntpunits=${systemdutildir}/ntp-units.d
--
--[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] \
--    || systemdntpunitsconfdir=$(pkg-config systemd --variable=systemdntpunitsconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdutilconfdir}/ntp-units.d
--
--[[ -d $dracutsysrootdir$systemdportable ]] \
--    || systemdportable=$(pkg-config systemd --variable=systemdportable 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemdportable ]] || systemdportable=${systemdutildir}/portable
--
--[[ -d $dracutsysrootdir$systemdportableconfdir ]] \
--    || systemdportableconfdir=$(pkg-config systemd --variable=systemdportableconfdir 2> /dev/null)
--
--[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdutilconfdir}/portable
--
--[[ -d $dracutsysrootdir$systemdsystemunitdir ]] \
--    || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2> /dev/null)
--
--[[ -d "$dracutsysrootdir$systemdsystemunitdir" ]] || systemdsystemunitdir=${systemdutildir}/system
--
--[[ -d $dracutsysrootdir$systemduser ]] \
--    || systemduser=$(pkg-config systemd --variable=systemduser 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemduser ]] || systemduser=${systemdutildir}/user
--
--[[ -d $dracutsysrootdir$systemduserconfdir ]] \
--    || systemduserconfdir=$(pkg-config systemd --variable=systemduserconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdutilconfdir}/user
--
--[[ -d $dracutsysrootdir$systemdsystemconfdir ]] \
--    || systemdsystemconfdir=$(pkg-config systemd --variable=systemdsystemconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$systemdsystemconfdir ]] || systemdsystemconfdir=/etc/systemd/system
--
--[[ -d $dracutsysrootdir$sysusers ]] \
--    || sysusers=$(pkg-config systemd --variable=sysusers 2> /dev/null)
--
- [[ -d $dracutsysrootdir$sysusers ]] || sysusers=/usr/lib/sysusers.d
+ }

  
  

--[[ -d $dracutsysrootdir$sysusersconfdir ]] \
--    || sysusersconfdir=$(pkg-config systemd --variable=sysusersconfdir 2> /dev/null)
--
- [[ -d $dracutsysrootdir$sysusersconfdir ]] || sysusersconfdir=/etc/sysusers.d
+-# dbus global variables
+-set_global_var "dbus" "dbus" "/usr/share/dbus-1"
+-set_global_var "dbus" "dbusconfdir" "/etc/dbus-1"
+-set_global_var "dbus" "dbusinterfaces" "${dbus}/interfaces"
+-set_global_var "dbus" "dbusinterfacesconfdir" "${dbusconfdir}/interfaces"
+-set_global_var "dbus" "dbusservices" "${dbus}/services"
+-set_global_var "dbus" "dbusservicesconfdir" "${dbusconfdir}/services"
+-set_global_var "dbus" "dbussession" "${dbus}/session.d"
+-set_global_var "dbus" "dbussessionconfdir" "${dbusconfdir}/session.d"
+-set_global_var "dbus" "dbussystem" "${dbus}/system.d"
+-set_global_var "dbus" "dbussystemconfdir" "${dbusconfdir}/system.d"
+-set_global_var "dbus" "dbussystemservices" "${dbus}/system-services"
+-set_global_var "dbus" "dbussystemservicesconfdir" "${dbusconfdir}/system-services"
+-
+ # udev global variables
+ set_global_var "udev" "udevdir" "/lib/udev:/lib/udev/ata_id" "/usr/lib/udev:/usr/lib/udev/ata_id"
+ set_global_var "udev" "udevconfdir" "/etc/udev"
+ set_global_var "udev" "udevrulesdir" "${udevdir}/rules.d"
+ set_global_var "udev" "udevrulesconfdir" "${udevconfdir}/rules.d"
+ 
+-# systemd global variables
+-set_global_var "systemd" "prefix:systemdprefix" "/usr"
+-set_global_var "systemd" "systemdutildir" "/lib/systemd:/lib/systemd/systemd-udevd" "/usr/lib/systemd:/usr/lib/systemd/systemd-udevd"
+-set_global_var "systemd" "systemdutilconfdir" "/etc/systemd"
+-set_global_var "systemd" "environment" "/usr/lib/environment.d"
+-set_global_var "systemd" "environmentconfdir" "/etc/environment.d"
+-set_global_var "systemd" "modulesload" "/usr/lib/modules-load.d"
+-set_global_var "systemd" "modulesloadconfdir" "/etc/modules-load.d"
+-set_global_var "systemd" "sysctld" "/usr/lib/sysctl.d"
+-set_global_var "systemd" "sysctlconfdir" "/etc/sysctl.d"
+-set_global_var "systemd" "systemdcatalog" "${systemdutildir}/catalog"
+-set_global_var "systemd" "systemdnetwork" "${systemdutildir}/network"
+-set_global_var "systemd" "systemdnetworkconfdir" "${systemdutilconfdir}/network"
+-set_global_var "systemd" "systemdntpunits" "${systemdutildir}/ntp-units.d"
+-set_global_var "systemd" "systemdntpunitsconfdir" "${systemdutilconfdir}/ntp-units.d"
+-set_global_var "systemd" "systemdportable" "${systemdutildir}/portable"
+-set_global_var "systemd" "systemdportableconfdir" "${systemdutilconfdir}/portable"
+-set_global_var "systemd" "systemdsystemunitdir" "${systemdutildir}/system"
+-set_global_var "systemd" "systemdsystemconfdir" "${systemdutilconfdir}/system"
+-set_global_var "systemd" "systemduser" "${systemdutildir}/user"
+-set_global_var "systemd" "systemduserconfdir" "${systemdutilconfdir}/user"
+-set_global_var "systemd" "sysusers" "/usr/lib/sysusers.d"
+-set_global_var "systemd" "sysusersconfdir" "/etc/sysusers.d"
+-set_global_var "systemd" "tmpfilesdir" "/lib/tmpfiles.d" "/usr/lib/tmpfiles.d"
+-set_global_var "systemd" "tmpfilesconfdir" "/etc/tmpfiles.d"
+-
+ # libkmod global variables
+ set_global_var "libkmod" "depmodd" "/usr/lib/depmod.d"
+ set_global_var "libkmod" "depmodconfdir" "/etc/depmod.d"
+@@ -1596,11 +1549,6 @@
+             uefi_stub="$dracutsysrootdir${systemdprefix}/lib/systemd/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
+         fi

  
  

--[[ -d $dracutsysrootdir$tmpfilesdir ]] \
--    || tmpfilesdir=$(pkg-config systemd --variable=tmpfilesdir 2> /dev/null)
--
--if ! [[ -d $dracutsysrootdir$tmpfilesdir ]]; then
--    [[ -d $dracutsysrootdir/lib/tmpfiles.d ]] && tmpfilesdir=/lib/tmpfiles.d
--    [[ -d $dracutsysrootdir/usr/lib/tmpfiles.d ]] && tmpfilesdir=/usr/lib/tmpfiles.d
--fi
--
--[[ -d $dracutsysrootdir$tmpfilesconfdir ]] \
--    || tmpfilesconfdir=$(pkg-config systemd --variable=tmpfilesconfdir 2> /dev/null)
--
--[[ -d $dracutsysrootdir$tmpfilesconfdir ]] || tmpfilesconfdir=/etc/tmpfiles.d
+-        if ! [[ -s $uefi_stub ]]; then
+-            dfatal "Can't find a uefi stub '$uefi_stub' to create a UEFI executable"
+-            exit 1
+-        fi

 -
 -

- [[ -d $dracutsysrootdir$depmodd ]] \
-     || depmodd=$(pkg-config libkmod --variable=depmodd 2> /dev/null)
- 
-@@ -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 \
--    prefix filesystems drivers dbus dbusconfdir dbusinterfaces \
--    dbusinterfacesconfdir dbusservices dbusservicesconfdir dbussession \
--    dbussessionconfdir dbussystem dbussystemconfdir dbussystemservices \
--    dbussystemservicesconfdir environment environmentconfdir modulesload \
-+    prefix filesystems drivers environment environmentconfdir modulesload \
-     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.
-@@ -2169,17 +1985,6 @@ if [[ $kernel_only != yes ]]; then
+         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 @@

          cat "$f" >> "${initdir}/etc/fstab"
      done
  
          cat "$f" >> "${initdir}/etc/fstab"
      done
  


@@ -300,6 +131,7 @@ diff -urpa dracut-059.orig/dracut.sh dracut-059/dracut.sh
 -                printf "%s\n" "systemdutildir=\"$systemdutildir\""
 -                printf "%s\n" "systemdsystemunitdir=\"$systemdsystemunitdir\""
 -                printf "%s\n" "systemdsystemconfdir=\"$systemdsystemconfdir\""
 -                printf "%s\n" "systemdutildir=\"$systemdutildir\""
 -                printf "%s\n" "systemdsystemunitdir=\"$systemdsystemunitdir\""
 -                printf "%s\n" "systemdsystemconfdir=\"$systemdsystemconfdir\""

+-                printf "%s\n" "systemdnetworkconfdir=\"$systemdnetworkconfdir\""

 -            } > "${initdir}"/etc/conf.d/systemd.conf
 -        fi
 -    fi
 -            } > "${initdir}"/etc/conf.d/systemd.conf
 -        fi
 -    fi


@@ -307,7 +139,7 @@ diff -urpa dracut-059.orig/dracut.sh dracut-059/dracut.sh
      if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then
          dinfo "*** Resolving executable dependencies ***"
          # shellcheck disable=SC2086
      if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then
          dinfo "*** Resolving executable dependencies ***"
          # shellcheck disable=SC2086

-@@ -2712,25 +2517,4 @@ freeze_ok_for_fstype() {
+@@ -2693,25 +2629,4 @@

      esac
  }
  
      esac
  }
  


@@ -333,37 +165,10 @@ diff -urpa dracut-059.orig/dracut.sh dracut-059/dracut.sh
 -fi
 -
  exit 0
 -fi
 -
  exit 0

-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
+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
+@@ -4,15 +4,9 @@

  
  # systemd lets stdout go to journal only, but the system
  # has to halt when the integrity check fails to satisfy FIPS.
  
  # systemd lets stdout go to journal only, but the system
  # has to halt when the integrity check fails to satisfy FIPS.


@@ -380,12 +185,12 @@ diff -urpa dracut-059.orig/modules.d/01fips/fips.sh dracut-059/modules.d/01fips/
 +    info "$*"
 +}
  
 +    info "$*"
 +}
  

- mount_boot() {
-     boot=$(getarg boot=)
-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() {
+ # 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
+@@ -14,12 +14,8 @@

  
  # called by dracut
  install() {
  
  # called by dracut
  install() {


@@ -402,10 +207,10 @@ diff -urpa dracut-059.orig/modules.d/02caps/module-setup.sh dracut-059/modules.d
 +    # capsh wants bash and we need bash also
 +    inst /bin/bash
  }
 +    # capsh wants bash and we need bash also
 +    inst /bin/bash
  }

-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() {
+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
+@@ -15,20 +15,17 @@

  install() {
      # Do not add watchdog hooks if systemd module is included
      # In that case, systemd will manage watchdog kick
  install() {
      # Do not add watchdog hooks if systemd module is included
      # In that case, systemd will manage watchdog kick


@@ -437,9 +242,9 @@ diff -urpa dracut-059.orig/modules.d/04watchdog/module-setup.sh dracut-059/modul
      inst_hook emergency 02 "$moddir/watchdog-stop.sh"
      inst_multiple -o wdctl
  }
      inst_hook emergency 02 "$moddir/watchdog-stop.sh"
      inst_multiple -o wdctl
  }

-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
+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

 @@ -1,11 +1,5 @@
  #!/bin/sh
  
 @@ -1,11 +1,5 @@
  #!/bin/sh
  


@@ -452,10 +257,10 @@ diff -urpa dracut-059.orig/modules.d/10i18n/console_init.sh dracut-059/modules.d
  [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
  
  DEFAULT_FONT=eurlatgr
  [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
  
  DEFAULT_FONT=eurlatgr

-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() {
+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
+@@ -13,13 +13,6 @@

  install() {
      declare -A KEYMAPS
  
  install() {
      declare -A KEYMAPS
  


@@ -469,7 +274,7 @@ diff -urpa dracut-059.orig/modules.d/10i18n/module-setup.sh dracut-059/modules.d
      KBDSUBDIRS=(consolefonts consoletrans keymaps unimaps)
      DEFAULT_FONT="${i18n_default_font:-eurlatgr}"
      I18N_CONF="/etc/locale.conf"
      KBDSUBDIRS=(consolefonts consoletrans keymaps unimaps)
      DEFAULT_FONT="${i18n_default_font:-eurlatgr}"
      I18N_CONF="/etc/locale.conf"

-@@ -122,11 +115,9 @@ install() {
+@@ -117,11 +110,9 @@

      install_base() {
          inst_multiple setfont loadkeys kbd_mode stty
  
      install_base() {
          inst_multiple setfont loadkeys kbd_mode stty
  


@@ -484,7 +289,7 @@ diff -urpa dracut-059.orig/modules.d/10i18n/module-setup.sh dracut-059/modules.d
  
          if [[ ${kbddir} != "/usr/share" ]]; then
              inst_dir /usr/share
  
          if [[ ${kbddir} != "/usr/share" ]]; then
              inst_dir /usr/share

-@@ -244,17 +235,11 @@ install() {
+@@ -252,17 +243,11 @@

              inst_simple "${kbddir}"/unimaps/"${FONT_UNIMAP}".uni
          fi
  
              inst_simple "${kbddir}"/unimaps/"${FONT_UNIMAP}".uni
          fi
  


@@ -506,7 +311,7 @@ diff -urpa dracut-059.orig/modules.d/10i18n/module-setup.sh dracut-059/modules.d
  
          return 0
      }
  
          return 0
      }

-@@ -283,11 +268,6 @@ install() {
+@@ -291,11 +276,6 @@

      if checks; then
          install_base
  
      if checks; then
          install_base
  


@@ -518,26 +323,28 @@ diff -urpa dracut-059.orig/modules.d/10i18n/module-setup.sh dracut-059/modules.d
          if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} == "yes" ]]; then
              install_local_i18n || install_all_kbd
          else
          if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} == "yes" ]]; then
              install_local_i18n || install_all_kbd
          else

-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() {
+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
+@@ -24,14 +24,6 @@

  install() {
      local _arch
  
  install() {
      local _arch
  

--    #Adding default link
+-    # Adding default link and (if exists) 98-default-mac-none.link

 -    if dracut_module_included "systemd"; then
 -    if dracut_module_included "systemd"; then

--        inst_multiple -o "${systemdnetwork}/99-default.link"
+-        inst_multiple -o \
+-            "${systemdnetwork}/99-default.link" \
+-            "${systemdnetwork}/98-default-mac-none.link"

 -        [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link"
 -    fi
 -
      inst_multiple ip dhclient sed awk grep pgrep tr expr
  
      inst_multiple -o arping arping2
 -        [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link"
 -    fi
 -
      inst_multiple ip dhclient sed awk grep pgrep tr expr
  
      inst_multiple -o arping arping2

-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 || . /
+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
+@@ -102,11 +102,8 @@

  
          for iface in $IFACES; do
              if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
  
          for iface in $IFACES; do
              if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then


@@ -551,42 +358,30 @@ diff -urpa dracut-059.orig/modules.d/35network-legacy/net-genrules.sh dracut-059
              fi
          done
      # Default: We don't know the interface to use, handle all
              fi
          done
      # Default: We don't know the interface to use, handle all

-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() {
+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 "
  
      is_qemu_virtualized && echo -n "qemu-net "
  

--    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 [ -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
--            network_handler="systemd-networkd"
--        else
--            network_handler="network-legacy"
--        fi
--    fi
--    echo "kernel-network-modules $network_handler"
-+    echo "kernel-network-modules network-legacy"
-     return 0
- }
+-    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
+             echo "$module"
+             return 0
+         fi
+     done

  
  

-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() {
+-    for module in network-manager systemd-networkd connman; do
++    for module in network-manager; do
+         # 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
+@@ -59,7 +59,7 @@

  configured_ifaces() {
      local IFACES="" iface_id="" rv=1
      [ -e "/tmp/net.ifaces" ] && read -r IFACES < /tmp/net.ifaces
  configured_ifaces() {
      local IFACES="" iface_id="" rv=1
      [ -e "/tmp/net.ifaces" ] && read -r IFACES < /tmp/net.ifaces


@@ -595,34 +390,20 @@ diff -urpa dracut-059.orig/modules.d/40network/net-lib.sh dracut-059/modules.d/4
          for iface_id in $IFACES; do
              printf "%s\n" "$(iface_name "$iface_id")"
              rv=0
          for iface_id in $IFACES; do
              printf "%s\n" "$(iface_name "$iface_id")"
              rv=0

-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
+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"

  
  

--    if ! dracut_module_included "systemd"; then
--        inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
--        inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
--    fi
-+    inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
-+    inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
- }
-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_script "$moddir/test-init.sh" "/sbin/init"

 -
 -    inst_multiple -o plymouth
  }
 -
 -    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() {
+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
+@@ -51,9 +51,7 @@

          inst_rules 64-btrfs-dm.rules
      fi
  
          inst_rules 64-btrfs-dm.rules
      fi
  


@@ -633,10 +414,10 @@ diff -urpa dracut-059.orig/modules.d/90btrfs/module-setup.sh dracut-059/modules.
  
      inst_multiple -o btrfsck btrfs-zero-log
      inst "$(command -v btrfs)" /sbin/btrfs
  
      inst_multiple -o btrfsck btrfs-zero-log
      inst "$(command -v btrfs)" /sbin/btrfs

-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() {
+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
+@@ -105,30 +105,22 @@

  
      {
          flock -s 9
  
      {
          flock -s 9


@@ -681,10 +462,10 @@ diff -urpa dracut-059.orig/modules.d/90crypt/crypt-lib.sh dracut-059/modules.d/9
      } 9> /.console_lock
  
      [ $ret -ne 0 ] && echo "Wrong password" >&2
      } 9> /.console_lock
  
      [ $ret -ne 0 ] && echo "Wrong password" >&2

-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
+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
+@@ -11,7 +11,7 @@

  allowdiscards="-"
  
  # parse for allow-discards
  allowdiscards="-"
  
  # parse for allow-discards


@@ -693,7 +474,7 @@ diff -urpa dracut-059.orig/modules.d/90crypt/crypt-run-generator.sh dracut-059/m
      if discarduuids=$(getargs "rd.luks.allow-discards"); then
          discarduuids=$(str_replace "$discarduuids" 'luks-' '')
          if strstr " $discarduuids " " ${luks##luks-}"; then
      if discarduuids=$(getargs "rd.luks.allow-discards"); then
          discarduuids=$(str_replace "$discarduuids" 'luks-' '')
          if strstr " $discarduuids " " ${luks##luks-}"; then

-@@ -24,8 +24,4 @@ fi
+@@ -24,8 +24,4 @@

  
  echo "$luks $dev - timeout=0,$allowdiscards" >> /etc/crypttab
  
  
  echo "$luks $dev - timeout=0,$allowdiscards" >> /etc/crypttab
  


@@ -702,9 +483,9 @@ diff -urpa dracut-059.orig/modules.d/90crypt/crypt-run-generator.sh dracut-059/m
 -    systemctl start cryptsetup.target
 -fi
  exit 0
 -    systemctl start cryptsetup.target
 -fi
  exit 0

-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
+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

 @@ -4,7 +4,7 @@
  check() {
      local fs
 @@ -4,7 +4,7 @@
  check() {
      local fs


@@ -714,25 +495,7 @@ diff -urpa dracut-059.orig/modules.d/90crypt/module-setup.sh dracut-059/modules.
  
      [[ $hostonly ]] || [[ $mount_needs ]] && {
          for fs in "${host_fs_types[@]}"; do
  
      [[ $hostonly ]] || [[ $mount_needs ]] && {
          for fs in "${host_fs_types[@]}"; do

-@@ -20,17 +20,6 @@ check() {
- depends() {
-     local deps
-     deps="dm rootfs-block"
--    if [[ $hostonly && -f "$dracutsysrootdir"/etc/crypttab ]]; then
--        if grep -q -e "fido2-device=" -e "fido2-cid=" "$dracutsysrootdir"/etc/crypttab; then
--            deps+=" fido2"
--        fi
--        if grep -q "pkcs11-uri" "$dracutsysrootdir"/etc/crypttab; then
--            deps+=" pkcs11"
--        fi
--        if grep -q "tpm2-device=" "$dracutsysrootdir"/etc/crypttab; then
--            deps+=" tpm2-tss"
--        fi
--    fi
-     echo "$deps"
-     return 0
- }
-@@ -96,13 +85,11 @@ install() {
+@@ -81,13 +81,11 @@

      fi
  
      inst_hook cmdline 30 "$moddir/parse-crypt.sh"
      fi
  
      inst_hook cmdline 30 "$moddir/parse-crypt.sh"


@@ -751,33 +514,11 @@ diff -urpa dracut-059.orig/modules.d/90crypt/module-setup.sh dracut-059/modules.
  
      if [[ $hostonly ]] && [[ -f $dracutsysrootdir/etc/crypttab ]]; then
          # filter /etc/crypttab for the devices we need
  
      if [[ $hostonly ]] && [[ -f $dracutsysrootdir/etc/crypttab ]]; then
          # filter /etc/crypttab for the devices we need

-@@ -176,21 +163,5 @@ install() {
-     inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
-     inst_script "$moddir/crypt-run-generator.sh" "/sbin/crypt-run-generator"
- 
--    if dracut_module_included "systemd"; then
--        # the cryptsetup targets are already pulled in by 00systemd, but not
--        # the enablement symlinks
--        inst_multiple -o \
--            "$tmpfilesdir"/cryptsetup.conf \
--            "$systemdutildir"/system-generators/systemd-cryptsetup-generator \
--            "$systemdutildir"/systemd-cryptsetup \
--            "$systemdsystemunitdir"/systemd-ask-password-console.path \
--            "$systemdsystemunitdir"/systemd-ask-password-console.service \
--            "$systemdsystemunitdir"/cryptsetup.target \
--            "$systemdsystemunitdir"/sysinit.target.wants/cryptsetup.target \
--            "$systemdsystemunitdir"/remote-cryptsetup.target \
--            "$systemdsystemunitdir"/initrd-root-device.target.wants/remote-cryptsetup.target \
--            systemd-ask-password systemd-tty-ask-password-agent
--    fi
--
-     dracut_need_initqueue
- }
-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)
+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
+@@ -36,12 +36,6 @@
+     LUKS=$(getargs rd.luks.uuid)

      tout=$(getarg rd.luks.key.tout)
  
 -    if [ -e /etc/crypttab ]; then
      tout=$(getarg rd.luks.key.tout)
  
 -    if [ -e /etc/crypttab ]; then


@@ -789,7 +530,7 @@ diff -urpa dracut-059.orig/modules.d/90crypt/parse-crypt.sh dracut-059/modules.d
      if [ -n "$PARTUUID" ]; then
          for uuid in $PARTUUID; do
  
      if [ -n "$PARTUUID" ]; then
          for uuid in $PARTUUID; do
  

-@@ -58,28 +52,13 @@ else
+@@ -58,28 +52,13 @@

                  luksname="luks-$uuid"
              fi
  
                  luksname="luks-$uuid"
              fi
  


@@ -825,7 +566,7 @@ diff -urpa dracut-059.orig/modules.d/90crypt/parse-crypt.sh dracut-059/modules.d
          done
  
      elif [ -n "$SERIAL" ]; then
          done
  
      elif [ -n "$SERIAL" ]; then

-@@ -98,28 +77,13 @@ else
+@@ -98,28 +77,13 @@

                  luksname="luks-$serialid"
              fi
  
                  luksname="luks-$serialid"
              fi
  


@@ -861,7 +602,7 @@ diff -urpa dracut-059.orig/modules.d/90crypt/parse-crypt.sh dracut-059/modules.d
          done
  
      elif [ -n "$LUKS" ]; then
          done
  
      elif [ -n "$LUKS" ]; then

-@@ -138,30 +102,14 @@ else
+@@ -138,30 +102,14 @@

                  luksname="luks-$luksid"
              fi
  
                  luksname="luks-$luksid"
              fi
  


@@ -900,7 +641,7 @@ diff -urpa dracut-059.orig/modules.d/90crypt/parse-crypt.sh dracut-059/modules.d
  
              if [ $is_keysource -eq 0 ]; then
                  uuid=$luksid
  
              if [ $is_keysource -eq 0 ]; then
                  uuid=$luksid

-@@ -175,21 +123,12 @@ else
+@@ -175,21 +123,12 @@

              fi
          done
      elif getargbool 0 rd.auto; then
              fi
          done
      elif getargbool 0 rd.auto; then


@@ -928,30 +669,46 @@ diff -urpa dracut-059.orig/modules.d/90crypt/parse-crypt.sh dracut-059/modules.d
      fi
  
      echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new
      fi
  
      echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new

-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 "$check_dev")
--        systemctl start checkisomd5@"${p}".service
--    else
--        checkisomd5 --verbose "$check_dev"
--    fi
-+    checkisomd5 --verbose "$check_dev"
-     if [ $? -eq 1 ]; then
-         die "CD check failed!"
-         exit 1
+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
+@@ -20,9 +20,7 @@
+             return 0
+             ;;
+         CRYPT-*)
+-            if command -v systemd-cryptsetup > /dev/null; then
+-                DM_DISABLE_UDEV=true SYSTEMD_LOG_LEVEL=debug systemd-cryptsetup detach "$devname" && return 0
+-            elif command -v cryptsetup > /dev/null; then
++            if command -v cryptsetup > /dev/null; then
+                 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
+@@ -72,20 +72,13 @@
+     fi
+     getarg rd.live.check || check=""
+     if [ -n "$check" ]; then
+-        type plymouth > /dev/null 2>&1 && plymouth --hide-splash
+-        if [ -n "$DRACUT_SYSTEMD" ]; then
+-            p=$(dev_unit_name "$check_dev")
+-            systemctl start checkisomd5@"${p}".service
+-        else
+-            checkisomd5 --verbose "$check_dev"
+-        fi
++        checkisomd5 --verbose "$check_dev"
+         if [ $? -eq 1 ]; then
+             warn "Media check failed! We do not recommend using this medium. System will halt in 12 hours"
+             sleep 43200
+             die "Media check failed!"
+             exit 1
+         fi
+-        type plymouth > /dev/null 2>&1 && plymouth --show-splash

      fi
      fi

--    type plymouth > /dev/null 2>&1 && plymouth --show-splash

  fi
  
  fi
  

- ln -s "$livedev" /run/initramfs/livedev
-@@ -168,7 +161,6 @@ do_live_overlay() {
+@@ -178,7 +171,6 @@

                  fi
                  if [ -n "$overlayfs" ]; then
                      unset -v overlayfs
                  fi
                  if [ -n "$overlayfs" ]; then
                      unset -v overlayfs


@@ -959,7 +716,7 @@ diff -urpa dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracu
                  fi
                  setup="yes"
              else
                  fi
                  setup="yes"
              else

-@@ -177,9 +169,6 @@ do_live_overlay() {
+@@ -187,9 +179,6 @@

                      && [ -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}
                      && [ -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}


@@ -969,17 +726,17 @@ diff -urpa dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracu
                      overlayfs="required"
                      setup="yes"
                  fi
                      overlayfs="required"
                      setup="yes"
                  fi

-@@ -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}
+@@ -198,9 +187,6 @@
+             && [ -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}

 -            if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then
 -                reloadsysrootmountunit=":>/xor_overlayfs;"
 -            fi
              overlayfs="required"
              setup="yes"
          fi
 -            if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then
 -                reloadsysrootmountunit=":>/xor_overlayfs;"
 -            fi
              overlayfs="required"
              setup="yes"
          fi

-@@ -201,7 +187,6 @@ do_live_overlay() {
+@@ -211,7 +197,6 @@

                  die "OverlayFS is required but not available."
                  exit 1
              fi
                  die "OverlayFS is required but not available."
                  exit 1
              fi


@@ -987,7 +744,7 @@ diff -urpa dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracu
              m='OverlayFS is not available; using temporary Device-mapper overlay.'
              info "$m"
              unset -v overlayfs setup
              m='OverlayFS is not available; using temporary Device-mapper overlay.'
              info "$m"
              unset -v overlayfs setup

-@@ -218,40 +203,13 @@ do_live_overlay() {
+@@ -228,40 +213,13 @@

        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
        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


@@ -1030,7 +787,7 @@ diff -urpa dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracu
              fi
          else
              dd if=/dev/null of=/overlay bs=1024 count=1 seek=$((overlay_size * 1024)) 2> /dev/null
              fi
          else
              dd if=/dev/null of=/overlay bs=1024 count=1 seek=$((overlay_size * 1024)) 2> /dev/null

-@@ -334,9 +292,6 @@ if [ -e "$SQUASHED" ]; then
+@@ -346,9 +304,6 @@

          fi
      elif [ -d /run/initramfs/squashfs/proc ]; then
          FSIMG=$SQUASHED
          fi
      elif [ -d /run/initramfs/squashfs/proc ]; then
          FSIMG=$SQUASHED


@@ -1040,7 +797,7 @@ diff -urpa dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracu
          overlayfs="required"
      else
          die "Failed to find a root filesystem in $SQUASHED."
          overlayfs="required"
      else
          die "Failed to find a root filesystem in $SQUASHED."

-@@ -411,10 +366,8 @@ if [ -n "$overlayfs" ]; then
+@@ -427,10 +382,8 @@

          ln -sf /run/initramfs/live /run/rootfsbase
      fi
  else
          ln -sf /run/initramfs/live /run/rootfsbase
      fi
  else


@@ -1053,10 +810,10 @@ diff -urpa dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracu
  fi
  [ -e "$SQUASHED" ] && umount -l /run/initramfs/squashfs
  
  fi
  [ -e "$SQUASHED" ] && umount -l /run/initramfs/squashfs
  

-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() {
+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
+@@ -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"
      inst_script "$moddir/iso-scan.sh" "/sbin/iso-scan"
      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"


@@ -1066,10 +823,10 @@ diff -urpa dracut-059.orig/modules.d/90dmsquash-live/module-setup.sh dracut-059/
 -    fi
      dracut_need_initqueue
  }
 -    fi
      dracut_need_initqueue
  }

-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() {
+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
+@@ -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"
      [[ $hostonly ]] && inst_multiple -H -o /etc/modprobe.d/*.conf /etc/modprobe.conf
      [[ -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


@@ -1080,10 +837,10 @@ diff -urpa dracut-059.orig/modules.d/90kernel-modules/module-setup.sh dracut-059
      inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
      inst_multiple -o sysctl
  }
      inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
      inst_multiple -o sysctl
  }

-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() {
+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
+@@ -17,8 +17,5 @@

      inst_hook cmdline 29 "$moddir/parse-livenet.sh"
      inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh"
      inst_script "$moddir/livenetroot.sh" "/sbin/livenetroot"
      inst_hook cmdline 29 "$moddir/parse-livenet.sh"
      inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh"
      inst_script "$moddir/livenetroot.sh" "/sbin/livenetroot"


@@ -1092,10 +849,10 @@ diff -urpa dracut-059.orig/modules.d/90livenet/module-setup.sh dracut-059/module
 -    fi
      dracut_need_initqueue
  }
 -    fi
      dracut_need_initqueue
  }

-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() {
+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
+@@ -114,20 +114,6 @@

      inst_hook shutdown 30 "$moddir/md-shutdown.sh"
      inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
      inst_script "$moddir/mdraid_start.sh" /sbin/mdraid_start
      inst_hook shutdown 30 "$moddir/md-shutdown.sh"
      inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
      inst_script "$moddir/mdraid_start.sh" /sbin/mdraid_start


@@ -1116,10 +873,10 @@ diff -urpa dracut-059.orig/modules.d/90mdraid/module-setup.sh dracut-059/modules
      inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
      dracut_need_initqueue
  }
      inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
      dracut_need_initqueue
  }

-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() {
+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
+@@ -146,17 +146,8 @@

          [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/90multipath.conf"
      fi
  
          [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/90multipath.conf"
      fi
  


@@ -1128,7 +885,6 @@ diff -urpa dracut-059.orig/modules.d/90multipath/module-setup.sh dracut-059/modu
 -            inst_simple "${moddir}/multipathd-configure.service" "${systemdsystemunitdir}/multipathd-configure.service"
 -            $SYSTEMCTL -q --root "$initdir" enable multipathd-configure.service
 -        fi
 -            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
 -        inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service"
 -        $SYSTEMCTL -q --root "$initdir" enable multipathd.service
 -    else


@@ -1140,10 +896,10 @@ diff -urpa dracut-059.orig/modules.d/90multipath/module-setup.sh dracut-059/modu
  
      inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
      inst_hook shutdown 20 "$moddir/multipath-shutdown.sh"
  
      inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
      inst_hook shutdown 20 "$moddir/multipath-shutdown.sh"

-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
+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
+@@ -30,10 +30,6 @@

  
  umount ${MNT}
  
  
  umount ${MNT}
  


@@ -1154,22 +910,21 @@ diff -urpa dracut-059.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-059/m
  : > /tmp/install.zipl.cmdline-done
  
  exit 0
  : > /tmp/install.zipl.cmdline-done
  
  exit 0

-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 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 -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
+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
+@@ -43,7 +43,6 @@
+         showmount \
+         ssh \
+         strace \
+-        systemd-analyze \
+         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
+@@ -6,10 +6,8 @@

      lldpad -k
      # with systemd version 230, this is not necessary anymore
      # systemd commit cacf980ed44a28e276a6cc7f8fc41f991e2ab354
      lldpad -k
      # with systemd version 230, this is not necessary anymore
      # systemd commit cacf980ed44a28e276a6cc7f8fc41f991e2ab354


@@ -1184,10 +939,10 @@ diff -urpa dracut-059.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-059/modules.d
 +    cp /dev/shm/lldpad.state /run/initramfs/state/dev/shm/ > /dev/null 2>&1
 +    echo "files /dev/shm/lldpad.state" >> /run/initramfs/rwtab
  fi
 +    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 -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() {
+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
+@@ -27,9 +27,7 @@

  
  # systemd will mount and run fsck from /etc/fstab and we don't want to
  # run into a race condition.
  
  # systemd will mount and run fsck from /etc/fstab and we don't want to
  # run into a race condition.


@@ -1198,9 +953,9 @@ diff -urpa dracut-059.orig/modules.d/95fstab-sys/mount-sys.sh dracut-059/modules
  
  # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
  if [ -f "$NEWROOT"/etc/fstab.sys ]; then
  
  # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
  if [ -f "$NEWROOT"/etc/fstab.sys ]; then

-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
+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

 @@ -1,5 +1,5 @@
  #!/bin/sh
  
 @@ -1,5 +1,5 @@
  #!/bin/sh
  


@@ -1208,10 +963,10 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-059/modules
 +if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
      killproc iscsiuio
  fi
 +if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
      killproc iscsiuio
  fi

-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#:}
+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
+@@ -37,8 +37,7 @@

  modprobe crc32c 2> /dev/null
  
  # start iscsiuio if needed
  modprobe crc32c 2> /dev/null
  
  # start iscsiuio if needed


@@ -1221,7 +976,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/iscsiroot.sh dracut-059/modules.d/9
      && ! [ -e /tmp/iscsiuio-started ]; then
      iscsiuio
      : > /tmp/iscsiuio-started
      && ! [ -e /tmp/iscsiuio-started ]; then
      iscsiuio
      : > /tmp/iscsiuio-started

-@@ -150,11 +149,6 @@ handle_netroot() {
+@@ -150,11 +149,6 @@

          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator


@@ -1233,7 +988,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/iscsiroot.sh dracut-059/modules.d/9
      fi
  
      if [ -z "$iscsi_initiator" ]; then
      fi
  
      if [ -z "$iscsi_initiator" ]; then

-@@ -171,11 +165,6 @@ handle_netroot() {
+@@ -171,11 +165,6 @@

          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator


@@ -1245,7 +1000,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/iscsiroot.sh dracut-059/modules.d/9
      fi
  
      if [ -z "$iscsi_target_port" ]; then
      fi
  
      if [ -z "$iscsi_target_port" ]; then

-@@ -195,17 +184,10 @@ handle_netroot() {
+@@ -195,17 +184,10 @@

      if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
      if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi


@@ -1265,7 +1020,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/iscsiroot.sh dracut-059/modules.d/9
  
      # FIXME $iscsi_protocol??
  
  
      # FIXME $iscsi_protocol??
  

-@@ -217,8 +199,7 @@ handle_netroot() {
+@@ -217,8 +199,7 @@

          wait_for_dev -n /dev/root
  
          # install mount script
          wait_for_dev -n /dev/root
  
          # install mount script


@@ -1275,10 +1030,10 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/iscsiroot.sh dracut-059/modules.d/9
      fi
  
      if strglobin "$iscsi_target_ip" '*:*:*' && ! strglobin "$iscsi_target_ip" '['; then
      fi
  
      if strglobin "$iscsi_target_ip" '*:*:*' && ! strglobin "$iscsi_target_ip" '['; then

-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() {
+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 umount iscsi-iname iscsiadm iscsid
      inst_binary sort
  


@@ -1290,10 +1045,10 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/module-setup.sh dracut-059/modules.
 -        "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket \
 -        "$systemdsystemunitdir"/sockets.target.wants/iscsiuio.socket
 -
 -        "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket \
 -        "$systemdsystemunitdir"/sockets.target.wants/iscsiuio.socket
 -

+     inst_simple /etc/iscsi/iscsid.conf

      if [[ $hostonly ]]; then
      if [[ $hostonly ]]; then

-         local -a _filenames
- 
-@@ -218,74 +210,7 @@ install() {
+         inst_simple /etc/iscsi/initiatorname.iscsi
+@@ -214,74 +206,7 @@

      inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
      inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
      inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
      inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
      inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
      inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"


@@ -1369,10 +1124,10 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/module-setup.sh dracut-059/modules.
      inst_dir /var/lib/iscsi
      mkdir -p "${initdir}/var/lib/iscsi/nodes"
      # Fedora 34 iscsid wants a non-empty /var/lib/iscsi/nodes directory
      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 -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
+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 @@

      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
      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


@@ -1380,7 +1135,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-059/modul
      root=/dev/root
  
      write_fs_tab /dev/root
      root=/dev/root
  
      write_fs_tab /dev/root

-@@ -58,7 +57,6 @@ done
+@@ -58,7 +57,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
  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


@@ -1388,7 +1143,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-059/modul
  fi
  
  if [ -n "$iscsiroot" ]; then
  fi
  
  if [ -n "$iscsiroot" ]; then

-@@ -84,7 +82,7 @@ if [ -n "$iscsi_firmware" ]; then
+@@ -84,7 +82,7 @@

      modprobe -b -q iscsi_boot_sysfs 2> /dev/null
      modprobe -b -q iscsi_ibft
      # if no ip= is given, but firmware
      modprobe -b -q iscsi_boot_sysfs 2> /dev/null
      modprobe -b -q iscsi_ibft
      # if no ip= is given, but firmware


@@ -1397,7 +1152,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-059/modul
      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'"
      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'"

-@@ -110,11 +108,6 @@ if arg=$(getarg rd.iscsi.initiator -d is
+@@ -114,11 +112,6 @@

      rm -f /etc/iscsi/initiatorname.iscsi
      mkdir -p /etc/iscsi
      ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
      rm -f /etc/iscsi/initiatorname.iscsi
      mkdir -p /etc/iscsi
      ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi


@@ -1409,7 +1164,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-059/modul
  fi
  
  # If not given on the cmdline and initiator-name available via iBFT
  fi
  
  # If not given on the cmdline and initiator-name available via iBFT

-@@ -126,11 +119,6 @@ if [ -z "$iscsi_initiator" ] && [ -f /sy
+@@ -130,11 +123,6 @@

          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator
          mkdir -p /etc/iscsi
          ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
          : > /tmp/iscsi_set_initiator


@@ -1421,7 +1176,7 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-059/modul
      fi
  fi
  
      fi
  fi
  

-@@ -145,7 +133,7 @@ for nroot in $(getargs netroot); do
+@@ -149,7 +137,7 @@

      type parse_iscsi_root > /dev/null 2>&1 || . /lib/net-lib.sh
      parse_iscsi_root "$nroot" || return 1
      netroot_enc=$(str_replace "$nroot" '/' '\2f')
      type parse_iscsi_root > /dev/null 2>&1 || . /lib/net-lib.sh
      parse_iscsi_root "$nroot" || return 1
      netroot_enc=$(str_replace "$nroot" '/' '\2f')


@@ -1430,10 +1185,10 @@ diff -urpa dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-059/modul
  done
  
  # Done, all good!
  done
  
  # Done, all good!

-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() {
+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
+@@ -32,8 +32,5 @@

      inst nbd-client
      inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"
      inst_script "$moddir/nbdroot.sh" "/sbin/nbdroot"
      inst nbd-client
      inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"
      inst_script "$moddir/nbdroot.sh" "/sbin/nbdroot"


@@ -1442,10 +1197,10 @@ diff -urpa dracut-059.orig/modules.d/95nbd/module-setup.sh dracut-059/modules.d/
 -    fi
      dracut_need_initqueue
  }
 -    fi
      dracut_need_initqueue
  }

-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
+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
+@@ -101,27 +101,13 @@

      udevadm control --reload
      wait_for_dev -n /dev/root
  
      udevadm control --reload
      wait_for_dev -n /dev/root
  


@@ -1478,10 +1233,10 @@ diff -urpa dracut-059.orig/modules.d/95nbd/nbdroot.sh dracut-059/modules.d/95nbd
  fi
  
  if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then
  fi
  
  if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then

-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() {
+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
+@@ -58,16 +58,6 @@

          [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf"
      fi
  
          [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf"
      fi
  


@@ -1489,6 +1244,7 @@ diff -urpa dracut-059.orig/modules.d/95resume/module-setup.sh dracut-059/modules
 -    if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
 -        inst_multiple -o \
 -            "$systemdutildir"/system-generators/systemd-hibernate-resume-generator \
 -    if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
 -        inst_multiple -o \
 -            "$systemdutildir"/system-generators/systemd-hibernate-resume-generator \

+-            "$systemdsystemunitdir"/systemd-hibernate-resume.service \

 -            "$systemdsystemunitdir"/systemd-hibernate-resume@.service \
 -            "$systemdutildir"/systemd-hibernate-resume
 -        return 0
 -            "$systemdsystemunitdir"/systemd-hibernate-resume@.service \
 -            "$systemdutildir"/systemd-hibernate-resume
 -        return 0


@@ -1497,7 +1253,7 @@ diff -urpa dracut-059.orig/modules.d/95resume/module-setup.sh dracut-059/modules
      # Optional uswsusp support
      for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume; do
          [[ -x $dracutsysrootdir${_bin} ]] && {
      # Optional uswsusp support
      for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume; do
          [[ -x $dracutsysrootdir${_bin} ]] && {

-@@ -58,11 +49,7 @@ install() {
+@@ -77,11 +67,7 @@

          }
      done
  
          }
      done
  


@@ -1510,10 +1266,10 @@ diff -urpa dracut-059.orig/modules.d/95resume/module-setup.sh dracut-059/modules
  
      inst_script "$moddir/resume.sh" /lib/dracut/resume.sh
  }
  
      inst_script "$moddir/resume.sh" /lib/dracut/resume.sh
  }

-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() {
+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
+@@ -75,11 +75,9 @@

  
      inst_multiple umount
      inst_multiple tr
  
      inst_multiple umount
      inst_multiple tr


@@ -1527,13 +1283,13 @@ diff -urpa dracut-059.orig/modules.d/95rootfs-block/module-setup.sh dracut-059/m
 +    inst_hook mount 99 "$moddir/mount-root.sh"
  
      inst_hook initqueue/timeout 99 "$moddir/rootfallback.sh"
 +    inst_hook mount 99 "$moddir/mount-root.sh"
  
      inst_hook initqueue/timeout 99 "$moddir/rootfallback.sh"

- }
-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
+ 
+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
+@@ -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

  
 -    [[ -d ${initdir}/$systemdutildir ]] || mkdir -p "${initdir}/$systemdutildir"
 -    for _i in "${systemdutildir}"/systemd-udevd "${udevdir}"/udevd /sbin/udevd; do
  
 -    [[ -d ${initdir}/$systemdutildir ]] || mkdir -p "${initdir}/$systemdutildir"
 -    for _i in "${systemdutildir}"/systemd-udevd "${udevdir}"/udevd /sbin/udevd; do


@@ -1553,10 +1309,10 @@ diff -urpa dracut-059.orig/modules.d/95udev-rules/module-setup.sh dracut-059/mod
          exit 1
      fi
  
          exit 1
      fi
  

-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() {
+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
+@@ -13,8 +13,6 @@

  
  # called by dracut
  install() {
  
  # called by dracut
  install() {


@@ -1566,10 +1322,10 @@ diff -urpa dracut-059.orig/modules.d/98usrmount/module-setup.sh dracut-059/modul
 +    inst_hook pre-pivot 50 "$moddir/mount-usr.sh"
      :
  }
 +    inst_hook pre-pivot 50 "$moddir/mount-usr.sh"
      :
  }

-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() {
+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
+@@ -25,11 +25,6 @@

  dev_unit_name() {
      local dev="$1"
  
  dev_unit_name() {
      local dev="$1"
  


@@ -1578,10 +1334,10 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-dev-lib.sh dracut-059/modules
 -        return $?
 -    fi
 -
 -        return $?
 -    fi
 -

-     if [ "$dev" = "/" -o -z "$dev" ]; then
+     if [ "$dev" = "/" ] || [ -z "$dev" ]; then

          printf -- "-"
          return 0
          printf -- "-"
          return 0

-@@ -48,53 +43,6 @@ dev_unit_name() {
+@@ -48,53 +43,6 @@

      printf -- "%s" "$dev"
  }
  
      printf -- "%s" "$dev"
  }
  


@@ -1635,7 +1391,7 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-dev-lib.sh dracut-059/modules
  # wait_for_dev <dev> [<timeout>]
  #
  # Installs a initqueue-finished script,
  # wait_for_dev <dev> [<timeout>]
  #
  # Installs a initqueue-finished script,

-@@ -122,7 +70,6 @@ wait_for_dev() {
+@@ -122,7 +70,6 @@

          printf 'warn "\"%s\" does not exist"\n' "$1"
      } >> "${PREFIX}$hookdir/emergency/80-${_name}.sh"
  
          printf 'warn "\"%s\" does not exist"\n' "$1"
      } >> "${PREFIX}$hookdir/emergency/80-${_name}.sh"
  


@@ -1643,7 +1399,7 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-dev-lib.sh dracut-059/modules
  }
  
  cancel_wait_for_dev() {
  }
  
  cancel_wait_for_dev() {

-@@ -130,10 +77,4 @@ cancel_wait_for_dev() {
+@@ -130,10 +77,4 @@

      _name="$(str_replace "$1" '/' '\x2f')"
      rm -f -- "$hookdir/initqueue/finished/devexists-${_name}.sh"
      rm -f -- "$hookdir/emergency/80-${_name}.sh"
      _name="$(str_replace "$1" '/' '\x2f')"
      rm -f -- "$hookdir/initqueue/finished/devexists-${_name}.sh"
      rm -f -- "$hookdir/emergency/80-${_name}.sh"


@@ -1654,9 +1410,9 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-dev-lib.sh dracut-059/modules
 -        /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
 -    fi
  }
 -        /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
 -    fi
  }

-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
+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

 @@ -2,7 +2,6 @@
  
  type wait_for_dev > /dev/null 2>&1 || . /lib/dracut-dev-lib.sh
 @@ -2,7 +2,6 @@
  
  type wait_for_dev > /dev/null 2>&1 || . /lib/dracut-dev-lib.sh


@@ -1665,7 +1421,7 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/9
  export NEWROOT
  if [ -n "$NEWROOT" ]; then
      [ -d "$NEWROOT" ] || mkdir -p -m 0755 "$NEWROOT"
  export NEWROOT
  if [ -n "$NEWROOT" ]; then
      [ -d "$NEWROOT" ] || mkdir -p -m 0755 "$NEWROOT"

-@@ -63,33 +62,19 @@ trim() {
+@@ -65,33 +64,19 @@

      printf "%s" "$var"
  }
  
      printf "%s" "$var"
  }
  


@@ -1711,18 +1467,18 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/9
  
  vwarn() {
      while read -r line || [ -n "$line" ]; do
  
  vwarn() {
      while read -r line || [ -n "$line" ]; do

-@@ -444,10 +429,6 @@ die() {
+@@ -450,10 +435,6 @@

          source_hook "shutdown-emergency"
      fi
  
 -    if [ -n "$DRACUT_SYSTEMD" ]; then
          source_hook "shutdown-emergency"
      fi
  
 -    if [ -n "$DRACUT_SYSTEMD" ]; then

--        systemctl --no-block --force halt
+-        systemctl --no-block --force poweroff

 -    fi
 -
      exit 1
  }
  
 -    fi
 -
      exit 1
  }
  

-@@ -904,43 +885,35 @@ fi
+@@ -910,43 +891,35 @@

  
  _emergency_shell() {
      local _name="$1"
  
  _emergency_shell() {
      local _name="$1"


@@ -1739,7 +1495,7 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/9
 -        /sbin/rdsosreport
 -        echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
 -        echo 'after mounting them and attach it to a bug report.'
 -        /sbin/rdsosreport
 -        echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
 -        echo 'after mounting them and attach it to a bug report.'

--        if ! RD_DEBUG='' getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
+-        if ! RD_DEBUG='' getargbool 0 rd.debug -d -y rdnetdebug; then

 -            echo
 -            echo 'To get more debug information in the report,'
 -            echo 'reboot with "rd.debug" added to the kernel command line.'
 -            echo
 -            echo 'To get more debug information in the report,'
 -            echo 'reboot with "rd.debug" added to the kernel command line.'


@@ -1752,7 +1508,7 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/9
 +    /sbin/rdsosreport
 +    echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
 +    echo 'after mounting them and attach it to a bug report.'
 +    /sbin/rdsosreport
 +    echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
 +    echo 'after mounting them and attach it to a bug report.'

-+    if ! RD_DEBUG='' getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
++    if ! RD_DEBUG='' getargbool 0 rd.debug -d -y rdnetdebug; then

          echo
 -        export PS1="$_name:\${PWD}# "
 -        [ -e /.profile ] || : > /.profile
          echo
 -        export PS1="$_name:\${PWD}# "
 -        [ -e /.profile ] || : > /.profile


@@ -1760,15 +1516,15 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/9
 -        _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
 -        if [ -z "$_ctty" ]; then
 -            _ctty=console
 -        _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
 -        if [ -z "$_ctty" ]; then
 -            _ctty=console

--            while [ -f /sys/class/tty/$_ctty/active ]; do
--                read -r _ctty < /sys/class/tty/$_ctty/active
+-            while [ -f "/sys/class/tty/$_ctty/active" ]; do
+-                read -r _ctty < "/sys/class/tty/$_ctty/active"

 -                _ctty=${_ctty##* } # last one in the list
 -            done
 -            _ctty=/dev/$_ctty
 -        fi
 -        [ -c "$_ctty" ] || _ctty=/dev/tty1
 -        case "$(/usr/bin/setsid --help 2>&1)" in *--ctty*) CTTY="--ctty" ;; esac
 -                _ctty=${_ctty##* } # last one in the list
 -            done
 -            _ctty=/dev/$_ctty
 -        fi
 -        [ -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
+-        setsid ${CTTY:+"${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 'To get more debug information in the report,'
 +        echo 'reboot with "rd.debug" added to the kernel command line.'
 +    fi


@@ -1781,23 +1537,23 @@ diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/9
 +    _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
 +    if [ -z "$_ctty" ]; then
 +        _ctty=console
 +    _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
 +    if [ -z "$_ctty" ]; then
 +        _ctty=console

-+        while [ -f /sys/class/tty/$_ctty/active ]; do
-+            read -r _ctty < /sys/class/tty/$_ctty/active
++        while [ -f "/sys/class/tty/$_ctty/active" ]; do
++            read -r _ctty < "/sys/class/tty/$_ctty/active"

 +            _ctty=${_ctty##* } # last one in the list
 +        done
 +        _ctty=/dev/$_ctty
      fi
 +    [ -c "$_ctty" ] || _ctty=/dev/tty1
 +    case "$(/usr/bin/setsid --help 2>&1)" in *--ctty*) CTTY="--ctty" ;; esac
 +            _ctty=${_ctty##* } # last one in the list
 +        done
 +        _ctty=/dev/$_ctty
      fi
 +    [ -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
++    setsid ${CTTY:+"${CTTY}"} /bin/sh -i -l 0<> "$_ctty" 1<> "$_ctty" 2<> "$_ctty"

  }
  
  emergency_shell() {
  }
  
  emergency_shell() {

-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
+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 @@
+     && UDEV_LOG=debug

  
  # start up udev and trigger cold plugs
 -UDEV_LOG=$UDEV_LOG "$systemdutildir"/systemd-udevd --daemon --resolve-names=never
  
  # start up udev and trigger cold plugs
 -UDEV_LOG=$UDEV_LOG "$systemdutildir"/systemd-udevd --daemon --resolve-names=never


@@ -1805,23 +1561,25 @@ diff -urpa dracut-059.orig/modules.d/99base/init.sh dracut-059/modules.d/99base/
  
  UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
  
  
  UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
  

-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() {
+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 @@

      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_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_script "$moddir/init.sh" "/init"

 -        inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
 -    fi
 +    inst_multiple switch_root || dfatal "Failed to install switch_root"
 -        inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
 -    fi
 +    inst_multiple switch_root || dfatal "Failed to install switch_root"

++    inst_script "$moddir/init.sh" "/init"

 +    inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
  
 +    inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
  

-     if [[ $realinitpath ]]; then
-         for i in $realinitpath; do
-@@ -108,11 +106,8 @@ install() {
+     ln -fs /proc/self/mounts "$initdir/etc/mtab"
+     if [[ $ro_mnt == yes ]]; then
+@@ -100,11 +98,8 @@

          if [[ -n ${host_devs[*]} ]]; then
              dracut_need_initqueue
          fi
          if [[ -n ${host_devs[*]} ]]; then
              dracut_need_initqueue
          fi


@@ -1834,10 +1592,10 @@ diff -urpa dracut-059.orig/modules.d/99base/module-setup.sh dracut-059/modules.d
                  export PREFIX="$initdir"
                  export hookdir=/lib/dracut/hooks
  
                  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
+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
+@@ -149,12 +149,6 @@

  done
  [ $_cnt -ge 40 ] && _check_shutdown final
  
  done
  [ $_cnt -ge 40 ] && _check_shutdown final
  


@@ -1847,6 +1605,6 @@ diff -urpa dracut-059.orig/modules.d/99shutdown/shutdown.sh dracut-059/modules.d
 -    /oldroot/bin/plymouth --hide-splash
 -fi
 -
 -    /oldroot/bin/plymouth --hide-splash
 -fi
 -

- getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"
+ getargs 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"

  
  case "$ACTION" in
  
  case "$ACTION" in

diff --git a/os-release.patch b/os-release.patch
deleted file mode 100644 (file)
index 53bdbdb..0000000
--- a/os-release.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpa dracut-047.orig/modules.d/50plymouth/plymouth-populate-initrd.sh dracut-047/modules.d/50plymouth/plymouth-populate-initrd.sh
---- dracut-047.orig/modules.d/50plymouth/plymouth-populate-initrd.sh   2018-02-19 09:00:33.000000000 +0000
-+++ dracut-047/modules.d/50plymouth/plymouth-populate-initrd.sh        2018-03-15 12:03:37.494982675 +0000
-@@ -4,7 +4,7 @@ PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/s
- PLYMOUTH_THEME=$(plymouth-set-default-theme)
- 
- inst_multiple plymouthd plymouth \
--    /etc/system-release
-+    /etc/os-release
- 
- test -e "${PLYMOUTH_LOGO_FILE}" && inst_simple "${PLYMOUTH_LOGO_FILE}"
- 

diff --git a/proc_sys_remount.patch b/proc_sys_remount.patch
index 9dc6e4eb1c6402487709b6990d5f60c50c79cb87..99b6601283fa77ce7f303aa4fd644cdef9b881fc 100644 (file)
--- a/proc_sys_remount.patch
+++ b/proc_sys_remount.patch
@@ -1,7 +1,7 @@
-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-02-18 12:32:53.000000000 +0100
-+++ dracut-056/modules.d/99base/init.sh        2022-08-28 19:12:37.568702916 +0200
-@@ -271,6 +271,26 @@ getarg 'rd.break=cleanup' -d 'rdbreak=cl
+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 @@

  source_hook cleanup
  
  # By the time we get here, the root filesystem should be mounted.
  source_hook cleanup
  
  # By the time we get here, the root filesystem should be mounted.


@@ -26,5 +26,5 @@ diff -urpa dracut-056.orig/modules.d/99base/init.sh dracut-056/modules.d/99base/
 +mount -o remount,$sysopts /sys 2>&1
 +
  # Try to find init.
 +mount -o remount,$sysopts /sys 2>&1
 +
  # Try to find init.

- for i in "$(getarg real_init=)" "$(getarg init=)" $(getargs rd.distroinit=) /sbin/init; do
+ for i in "$(getarg init=)" /sbin/init; do

      [ -n "$i" ] || continue
      [ -n "$i" ] || continue