Merging debian version 102-1.

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

16 files changed, 49 insertions, 342 deletions

diff --git a/debian/changelog b/debian/changelog
index 1abdf38..2216aac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dracut (102-1) unstable; urgency=low
+
+  * new upstream:
+    Closes: 1029324, 1041614, 1022129, 1071592, 1072174, 1068250
+    Closes: 1071182, 1059501
+  * change to new dracut-ng upstream repository, the package name remains
+    unchanged
+  * apply salsa MR #11, Closes: 753752
+  * move kpartx from depends to recommends, Closes: 1033158
+
+ -- Thomas Lange <lange@debian.org>  Mon, 03 Jun 2024 14:14:11 +0200
+
 dracut (060+5-8~progress7.99u1) graograman-backports; urgency=low
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index e397f4b..a358723 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/dracut
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/dracut
 XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/dracut
 XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/dracut.git
-Homepage: https://github.com/dracutdevs/dracut/wiki/
+Homepage: https://github.com/dracut-ng/dracut-ng/wiki
 
 Package: dracut
 Architecture: all
@@ -28,8 +28,8 @@ Description: Initramfs generator using udev
 Package: dracut-core
 Architecture: any
 Multi-Arch: foreign
-Recommends: cryptsetup, dmsetup, dmraid, lvm2, mdadm, console-setup, binutils, systemd, pigz, pkgconf
-Depends: cpio, dracut-install, kmod, udev, kpartx, libkmod2, e2fsprogs, ${shlibs:Depends}, ${misc:Depends}
+Recommends: cryptsetup, dmsetup, dmraid, kpartx, lvm2, mdadm, console-setup, binutils, systemd, pigz, pkgconf
+Depends: cpio, dracut-install, kmod, udev, libkmod2, e2fsprogs, ${shlibs:Depends}, ${misc:Depends}
 Breaks: dracut-network (<< 057+157-2), dracut-live (<< 059-2)
 Replaces: dracut-network (<< 057+157-2), dracut-live (<< 059-2)
 Description: dracut is an event driven initramfs infrastructure (core tools)
diff --git a/debian/dracut-core.docs b/debian/dracut-core.docs
index ff0ef07..1c4d4e0 100644
--- a/debian/dracut-core.docs
+++ b/debian/dracut-core.docs
@@ -3,6 +3,5 @@ docs/HACKING.md
 NEWS.md
 README.md
 docs/README.cross
-docs/README.generic
 docs/README.kernel
 dracut.html
diff --git a/debian/dracut-core.install b/debian/dracut-core.install
index 7822ca6..dc710db 100644
--- a/debian/dracut-core.install
+++ b/debian/dracut-core.install
@@ -85,13 +85,11 @@ usr/lib/dracut/modules.d/91tpm2-tss
 usr/lib/dracut/modules.d/91zipl
 usr/lib/dracut/modules.d/95dasd
 usr/lib/dracut/modules.d/95dasd_mod
-usr/lib/dracut/modules.d/95dasd_rules
 usr/lib/dracut/modules.d/95dcssblk
 usr/lib/dracut/modules.d/95debug
 usr/lib/dracut/modules.d/95fstab-sys
 usr/lib/dracut/modules.d/95lunmask
 usr/lib/dracut/modules.d/95nvmf
-usr/lib/dracut/modules.d/95qeth_rules
 usr/lib/dracut/modules.d/95resume
 usr/lib/dracut/modules.d/95rootfs-block
 usr/lib/dracut/modules.d/95terminfo
diff --git a/debian/dracut-network.install b/debian/dracut-network.install
index b2aace1..3c6f5f5 100644
--- a/debian/dracut-network.install
+++ b/debian/dracut-network.install
@@ -11,7 +11,6 @@ usr/lib/dracut/modules.d/90qemu-net
 usr/lib/dracut/modules.d/95cifs
 usr/lib/dracut/modules.d/95znet
 usr/lib/dracut/modules.d/95zfcp
-usr/lib/dracut/modules.d/95zfcp_rules
 usr/lib/dracut/modules.d/95fcoe
 usr/lib/dracut/modules.d/95fcoe-uefi
 usr/lib/dracut/modules.d/95iscsi
diff --git a/debian/patches/04b362d713235459cff1f370efb4cd5e36e4a358.patch b/debian/patches/04b362d713235459cff1f370efb4cd5e36e4a358.patch
deleted file mode 100644
index 07cea4f..0000000
--- a/debian/patches/04b362d713235459cff1f370efb4cd5e36e4a358.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 04b362d713235459cff1f370efb4cd5e36e4a358 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Thu, 4 Apr 2024 13:49:26 +0200
-Subject: [PATCH] fix(systemd): explicitly install some libs that will not be
- statically included
-
-Some required libraries that used to be statically included are in the process
-to be opened via `dlopen()`.
-
-References:
-- https://github.com/systemd/systemd/pull/31131
-- https://github.com/systemd/systemd/pull/31550
-- https://github.com/systemd/systemd/pull/32019
-
-Closes #2642
----
- modules.d/00systemd/module-setup.sh          | 2 ++
- modules.d/01systemd-coredump/module-setup.sh | 7 +++++++
- modules.d/01systemd-journald/module-setup.sh | 5 +++--
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
-index 66e08ea69..723417464 100755
---- a/modules.d/00systemd/module-setup.sh
-+++ b/modules.d/00systemd/module-setup.sh
-@@ -260,6 +260,8 @@ EOF
-     # Install library file(s)
-     _arch=${DRACUT_ARCH:-$(uname -m)}
-     inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
-         {"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
- 
- }
-diff --git a/modules.d/01systemd-coredump/module-setup.sh b/modules.d/01systemd-coredump/module-setup.sh
-index 69ec96686..47666b6ca 100755
---- a/modules.d/01systemd-coredump/module-setup.sh
-+++ b/modules.d/01systemd-coredump/module-setup.sh
-@@ -40,6 +40,13 @@ install() {
-         "$sysusers"/systemd-coredump.conf \
-         coredumpctl
- 
-+    # Install library file(s)
-+    _arch=${DRACUT_ARCH:-$(uname -m)}
-+    inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*"
-+
-     # Install the hosts local user configurations if enabled.
-     if [[ $hostonly ]]; then
-         inst_multiple -H -o \
-diff --git a/modules.d/01systemd-journald/module-setup.sh b/modules.d/01systemd-journald/module-setup.sh
-index 3cf2a1a11..276e75282 100755
---- a/modules.d/01systemd-journald/module-setup.sh
-+++ b/modules.d/01systemd-journald/module-setup.sh
-@@ -53,9 +53,10 @@ install() {
-     # Install library file(s)
-     _arch=${DRACUT_ARCH:-$(uname -m)}
-     inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
-         {"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \
--        {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*" \
--        {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*"
-+        {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*"
- 
-     # Install the hosts local user configurations if enabled.
-     if [[ $hostonly ]]; then
diff --git a/debian/patches/debian-initramfs-post-update.patch b/debian/patches/debian-initramfs-post-update.patch
new file mode 100644
index 0000000..e2b5da8
--- /dev/null
+++ b/debian/patches/debian-initramfs-post-update.patch
@@ -0,0 +1,22 @@
+Description: Run bootloader hooks from /etc/initramfs/post-update.d after making
+ the image, and add $NO_POST_UPDATE_HOOKS to disable this
+ .
+ See <https://kernel-team.pages.debian.net/kernel-handbook/ch-update-hooks.html#s-initramfs-hooks>
+Author: наб <nabijaczleweli@nabijaczleweli.xyz>
+Bug-Debian: https://bugs.debian.org/753752
+Forwarded: not-needed
+Last-Update: 2022-11-17
+
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -2685,4 +2685,10 @@
+     fi
+ fi
+ 
++# Invoke policy-conformant bootloader hooks
++if [ -z "$NO_POST_UPDATE_HOOKS" ] && [ -d /etc/initramfs/post-update.d/ ]; then
++    run-parts --arg="${kernel}" --arg="${outfile}" \
++        /etc/initramfs/post-update.d/
++fi
++
+ exit 0
diff --git a/debian/patches/fix-test-running-tests-no-longer-requires-to-be-root.patch b/debian/patches/fix-test-running-tests-no-longer-requires-to-be-root.patch
deleted file mode 100644
index 3055a51..0000000
--- a/debian/patches/fix-test-running-tests-no-longer-requires-to-be-root.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Tue, 21 Feb 2023 00:20:29 +0000
-Subject: fix(test): running tests no longer requires to be root
-
-Origin: upstream, https://github.com/dracutdevs/dracut/pull/2429
----
- Makefile            |  1 -
- docs/HACKING.md     | 10 +++++-----
- test/Makefile       |  1 -
- test/test-functions | 12 ------------
- 4 files changed, 5 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 333cd68..10a8e63 100644
---- a/Makefile
-+++ b/Makefile
-@@ -264,7 +264,6 @@ endif
- endif
- 
- check: all syncheck
--	@[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
- 	@$(MAKE) -C test check
- 
- testimage: all
-diff --git a/docs/HACKING.md b/docs/HACKING.md
-index 6a19434..2e3d614 100644
---- a/docs/HACKING.md
-+++ b/docs/HACKING.md
-@@ -253,27 +253,27 @@ For the testsuite to pass, you will have to install at least the software packag
- mentioned in the `test/container` Dockerfiles.
- 
- ```
--$ sudo make clean check
-+$ make clean check
- ```
- 
- in verbose mode:
- ```
--$ sudo make V=1 clean check
-+$ make V=1 clean check
- ```
- 
- only specific test:
- ```
--$ sudo make TESTS="01 20 40" clean check
-+$ make TESTS="01 20 40" clean check
- ```
- only runs the 01, 20 and 40 tests.
- 
- debug a specific test case:
- ```
- $ cd TEST-01-BASIC
--$ sudo make clean setup run
-+$ make clean setup run
- ```
- ... change some kernel parameters in `test.sh` ...
- ```
--$ sudo make run
-+$ make run
- ```
- to run the test without doing the setup.
-diff --git a/test/Makefile b/test/Makefile
-index dfaa450..518e7d6 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -1,7 +1,6 @@
- .PHONY: all check clean $(wildcard TEST-??-*)
- 
- $(wildcard TEST-??-*):
--	@[ "$(shell id -u)" = 0 ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
- 	@{ \
- 		[ -d $@ ] || exit 0; \
- 		[ -f $@/Makefile ] || exit 0; \
-diff --git a/test/test-functions b/test/test-functions
-index f76d930..f28e30a 100644
---- a/test/test-functions
-+++ b/test/test-functions
-@@ -52,15 +52,6 @@ COLOR_FAILURE='\033[0;31m'
- COLOR_WARNING='\033[0;33m'
- COLOR_NORMAL='\033[0;39m'
- 
--check_root() {
--    if ((EUID != 0)); then
--        SETCOLOR_FAILURE
--        echo "Tests must be run as root! Please use 'sudo'."
--        SETCOLOR_NORMAL
--        exit 1
--    fi
--}
--
- # generate qemu arguments for named raw disks
- #
- # qemu_add_drive_args <index> <args> <filename> <id-name> [<bootindex>]
-@@ -122,13 +113,11 @@ test_marker_check() {
- while (($# > 0)); do
-     case $1 in
-         --run)
--            check_root
-             echo "TEST RUN: $TEST_DESCRIPTION"
-             test_check && test_run
-             exit $?
-             ;;
-         --setup)
--            check_root
-             echo "TEST SETUP: $TEST_DESCRIPTION"
-             test_check && test_setup
-             exit $?
-@@ -141,7 +130,6 @@ while (($# > 0)); do
-             exit $?
-             ;;
-         --all)
--            check_root
-             if ! test_check 2 &> test${TEST_RUN_ID:+-$TEST_RUN_ID}.log; then
-                 echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_WARNING" "[SKIPPED]" "$COLOR_NORMAL"
-                 exit 0
diff --git a/debian/patches/initrd-not-initramfs.patch b/debian/patches/initrd-not-initramfs.patch
deleted file mode 100644
index bcfbf39..0000000
--- a/debian/patches/initrd-not-initramfs.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/man/dracut.8.asc
-+++ b/man/dracut.8.asc
-@@ -24,7 +24,7 @@
- _/boot/<machine-id>/<kernel-version>/initrd_,
- _/boot/efi/<machine-id>/<kernel-version>/initrd_,
- _/lib/modules/<kernel-version>/initrd_ or
--_/boot/initramfs-<kernel-version>.img_.
-+_/boot/initrd.img-<kernel-version>_.
- 
- dracut creates an initial image used by the kernel for preloading the block
- device modules (such as IDE, SCSI or RAID) which are needed to access the root
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1154,7 +1154,7 @@
-         elif [[ -f "$dracutsysrootdir"/lib/modules/${kernel}/initrd ]]; then
-             outfile="$dracutsysrootdir/lib/modules/${kernel}/initrd"
-         elif [[ -e $dracutsysrootdir/boot/vmlinuz-${kernel} ]]; then
--            outfile="$dracutsysrootdir/boot/initramfs-${kernel}.img"
-+            outfile="$dracutsysrootdir/boot/initrd.img-${kernel}"
-         elif [[ -z $dracutsysrootdir ]] \
-             && [[ $MACHINE_ID ]] \
-             && mountpoint -q /efi; then
-@@ -1164,7 +1164,7 @@
-             && mountpoint -q /boot/efi; then
-             outfile="/boot/efi/${MACHINE_ID}/${kernel}/initrd"
-         else
--            outfile="$dracutsysrootdir/boot/initramfs-${kernel}.img"
-+            outfile="$dracutsysrootdir/boot/initrd.img-${kernel}"
-         fi
-     fi
- fi
---- a/man/dracut.usage.asc
-+++ b/man/dracut.usage.asc
-@@ -10,7 +10,7 @@
- _/boot/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
- _/boot/efi/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
- _/lib/modules/_++<kernel-version>++_/initrd_ or
--_/boot/initramfs-_++<kernel-version>++_.img_ and contains the kernel modules of
-+_/boot/initrd.img-_++<kernel-version>++_ and contains the kernel modules of
- the currently active kernel with version _++<kernel-version>++_.
- 
- If the initramfs image already exists, dracut will display an error message, and
---- a/man/lsinitrd.1.asc
-+++ b/man/lsinitrd.1.asc
-@@ -22,7 +22,7 @@
- _/boot/<machine-id>/<kernel-version>/initrd_,
- _/boot/efi/<machine-id>/<kernel-version>/initrd_,
- _/lib/modules/<kernel-version>/initrd_ or
--_/boot/initramfs-<kernel-version>.img_.
-+_/boot/initrd.img-<kernel-version>_.
- 
- OPTIONS
- -------
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -134,8 +134,8 @@
-         image="/lib/modules/${KERNEL_VERSION}/initrd"
-     elif [[ -f /lib/modules/${KERNEL_VERSION}/initramfs.img ]]; then
-         image="/lib/modules/${KERNEL_VERSION}/initramfs.img"
--    elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
--        image="/boot/initramfs-${KERNEL_VERSION}.img"
-+    elif [[ -f /boot/initrd.img-${KERNEL_VERSION} ]]; then
-+        image="/boot/initrd.img-${KERNEL_VERSION}"
-     elif [[ $MACHINE_ID ]] \
-         && mountpoint -q /efi; then
-         image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
---- a/dracut-initramfs-restore.sh
-+++ b/dracut-initramfs-restore.sh
-@@ -39,8 +39,8 @@
-     IMG="/boot/efi/$MACHINE_ID/$KERNEL_VERSION/initrd"
- elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then
-     IMG="/lib/modules/${KERNEL_VERSION}/initrd"
--elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
--    IMG="/boot/initramfs-${KERNEL_VERSION}.img"
-+elif [[ -f /boot/initrd.img-${KERNEL_VERSION} ]]; then
-+    IMG="/boot/initrd.img-${KERNEL_VERSION}"
- elif mountpoint -q /efi; then
-     IMG="/efi/$MACHINE_ID/$KERNEL_VERSION/initrd"
- elif mountpoint -q /boot/efi; then
diff --git a/debian/patches/microcode b/debian/patches/microcode
deleted file mode 100644
index 4e2fcfc..0000000
--- a/debian/patches/microcode
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2144,7 +2144,7 @@
-                 if [[ $hostonly ]]; then
-                     _src=$(get_ucode_file)
-                     [[ $_src ]] || break
--                    [[ -r $_fwdir/$_fw/$_src ]] || _src="${_src}.early"
-+                    [[ -r $_fwdir/$_fw/$_src ]] || _src="${_src}.initramfs"
-                     [[ -r $_fwdir/$_fw/$_src ]] || break
-                 fi
- 
diff --git a/debian/patches/rpc-user b/debian/patches/rpc-user
index 8656109..e9a8b8e 100644
--- a/debian/patches/rpc-user
+++ b/debian/patches/rpc-user
@@ -11,16 +11,16 @@
  
 --- a/modules.d/95nfs/parse-nfsroot.sh
 +++ b/modules.d/95nfs/parse-nfsroot.sh
-@@ -124,5 +124,5 @@
- echo '[ -e $NEWROOT/proc ]' > "$hookdir"/initqueue/finished/nfsroot.sh
- 
+@@ -126,5 +126,5 @@
+ # rpc user needs to be able to write to this directory to save the warmstart
+ # file
  mkdir -p /var/lib/rpcbind
 -chown rpc:rpc /var/lib/rpcbind
 +chown _rpc:root /var/lib/rpcbind
  chmod 770 /var/lib/rpcbind
 --- a/modules.d/95nfs/module-setup.sh
 +++ b/modules.d/95nfs/module-setup.sh
-@@ -125,14 +125,14 @@
+@@ -125,7 +125,7 @@
  
      # Rather than copy the passwd file in, just set a user for rpcbind
      # We'll save the state and restart the daemon from the root anyway
@@ -28,13 +28,4 @@
 +    grep -E '^nfsnobody:|^_rpc:|^rpcuser:' "$dracutsysrootdir"/etc/passwd >> "$initdir/etc/passwd"
      grep -E '^nogroup:|^rpc:|^nobody:' "$dracutsysrootdir"/etc/group >> "$initdir/etc/group"
  
-     # rpc user needs to be able to write to this directory to save the warmstart
-     # file
-     chmod 770 "$initdir/var/lib/rpcbind"
--    grep -q '^rpc:' "$dracutsysrootdir"/etc/passwd \
--        && grep -q '^rpc:' "$dracutsysrootdir"/etc/group
-+    grep -q '^_rpc:' "$dracutsysrootdir"/etc/passwd \
-+        && grep -q '^root:' "$dracutsysrootdir"/etc/group
- 
      dracut_need_initqueue
- }
diff --git a/debian/patches/series b/debian/patches/series
index ae21e64..7d275c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,6 @@
-04b362d713235459cff1f370efb4cd5e36e4a358.patch
 rpc-user
 udevsettle
 nm-path
 fido-libz
 vconsole
-microcode
-initrd-not-initramfs.patch
-fix-test-running-tests-no-longer-requires-to-be-root.patch
-test-FULL-SYSTEMD-no-need-to-include-dbus-to-the-target-r.patch
+debian-initramfs-post-update.patch
diff --git a/debian/patches/test-FULL-SYSTEMD-no-need-to-include-dbus-to-the-target-r.patch b/debian/patches/test-FULL-SYSTEMD-no-need-to-include-dbus-to-the-target-r.patch
deleted file mode 100644
index 2ff8adf..0000000
--- a/debian/patches/test-FULL-SYSTEMD-no-need-to-include-dbus-to-the-target-r.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Nov 2023 02:25:18 -0400
-Subject: test(FULL SYSTEMD): no need to include dbus to the target rootfs
-
-systemd does not depend on dbus.
-
-Origin: upstream, https://github.com/dracutdevs/dracut/pull/2549
----
- test/TEST-04-FULL-SYSTEMD/test-init.sh | 3 +--
- test/TEST-04-FULL-SYSTEMD/test.sh      | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-04-FULL-SYSTEMD/test-init.sh
-index b7261b5..055aa75 100755
---- a/test/TEST-04-FULL-SYSTEMD/test-init.sh
-+++ b/test/TEST-04-FULL-SYSTEMD/test-init.sh
-@@ -37,5 +37,4 @@ if getargbool 0 rd.shell; then
-     setsid $CTTY sh -i
- fi
- echo "Powering down."
--systemctl --no-block poweroff
--exit 0
-+poweroff -f
-diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
-index 160104f..a6d5345 100755
---- a/test/TEST-04-FULL-SYSTEMD/test.sh
-+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
-@@ -52,7 +52,7 @@ test_setup() {
- 
-     # Create what will eventually be our root filesystem onto an overlay
-     "$DRACUT" -l --keep --tmpdir "$TESTDIR" \
--        -m "test-root dbus" \
-+        -m "test-root systemd" \
-         -I "ldconfig" \
-         -i ./test-init.sh /sbin/test-init \
-         -i ./fstab /etc/fstab \
diff --git a/debian/patches/udevsettle b/debian/patches/udevsettle
index 4b1c592..3c14803 100644
--- a/debian/patches/udevsettle
+++ b/debian/patches/udevsettle
@@ -1,10 +1,10 @@
 --- a/modules.d/99base/init.sh
 +++ b/modules.d/99base/init.sh
-@@ -155,6 +155,7 @@
+@@ -157,6 +157,7 @@
  # then the rest
  udevadm trigger --type=subsystems --action=add > /dev/null 2>&1
  udevadm trigger --type=devices --action=add > /dev/null 2>&1
 +udevadm settle
  
  make_trace_mem "hook initqueue" '1:shortmem' '2+:mem' '3+:slab'
- getarg 'rd.break=initqueue' -d 'rdbreak=initqueue' && emergency_shell -n initqueue "Break before initqueue"
+ getargs 'rd.break=initqueue' -d 'rdbreak=initqueue' && emergency_shell -n initqueue "Break before initqueue"
diff --git a/debian/patches/vconsole b/debian/patches/vconsole
index 5729bd4..569b375 100644
--- a/debian/patches/vconsole
+++ b/debian/patches/vconsole
@@ -1,8 +1,8 @@
 --- a/modules.d/00systemd/module-setup.sh
 +++ b/modules.d/00systemd/module-setup.sh
-@@ -245,7 +245,8 @@
-         systemd-ask-password-console.service \
-         systemd-ask-password-plymouth.service; do
+@@ -158,7 +158,8 @@
+         emergency.target \
+         rescue.target; do
          [[ -f "$systemdsystemunitdir"/$i ]] || continue
 -        $SYSTEMCTL -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
 +        # $SYSTEMCTL -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
diff --git a/debian/rules b/debian/rules
index b6f1f77..64b8941 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,8 @@ override_dh_fixperms-indep:
 	rm -f debian/*/usr/lib/dracut/modules.d/98dracut-systemd/*.8
 ifneq ($(DEB_HOST_ARCH), s390x)
 	for m in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
-		95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
-		95zfcp_rules 95znet; do \
+		95dcssblk 95zfcp \
+		95znet; do \
 		rm -rf debian/*/usr/lib/dracut/modules.d/$$m ; \
 	done
 else