From edaf8be1032c859af78b30704f80744ad3edca0c Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 9 Jul 2023 23:42:37 +0200 Subject: [PATCH] - rediffed --- no_systemd.patch | 254 +++++++++++++++++++++++------------------------ 1 file changed, 127 insertions(+), 127 deletions(-) diff --git a/no_systemd.patch b/no_systemd.patch index a6a10ff..72f412b 100644 --- a/no_systemd.patch +++ b/no_systemd.patch @@ -1,6 +1,6 @@ -diff -urpa dracut-056.orig/dracut-init.sh dracut-056/dracut-init.sh ---- dracut-056.orig/dracut-init.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/dracut-init.sh 2022-08-30 01:20:04.811493149 +0200 +diff -urNp -x '*.orig' dracut-056.org/dracut-init.sh dracut-056/dracut-init.sh +--- dracut-056.org/dracut-init.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/dracut-init.sh 2023-07-09 23:41:02.783913821 +0200 @@ -1089,16 +1089,6 @@ fi is_qemu_virtualized() { # 0 if a virt environment was detected @@ -18,9 +18,9 @@ diff -urpa dracut-056.orig/dracut-init.sh dracut-056/dracut-init.sh for i in /sys/class/dmi/id/*_vendor; do [[ -f $i ]] || continue read -r vendor < "$i" -diff -urpa dracut-056.orig/dracut-logger.sh dracut-056/dracut-logger.sh ---- dracut-056.orig/dracut-logger.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/dracut-logger.sh 2022-08-30 01:41:07.943471592 +0200 +diff -urNp -x '*.orig' dracut-056.org/dracut-logger.sh dracut-056/dracut-logger.sh +--- dracut-056.org/dracut-logger.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/dracut-logger.sh 2023-07-09 23:41:02.783913821 +0200 @@ -142,16 +142,7 @@ dlog_init() { fi @@ -39,9 +39,9 @@ diff -urpa dracut-056.orig/dracut-logger.sh dracut-056/dracut-logger.sh # We cannot log to syslog, so turn this facility off. kmsgloglvl=$sysloglvl sysloglvl=0 -diff -urpa dracut-056.orig/dracut.sh dracut-056/dracut.sh ---- dracut-056.orig/dracut.sh 2022-08-28 17:26:54.017178064 +0200 -+++ dracut-056/dracut.sh 2022-08-30 01:40:33.614418115 +0200 +diff -urNp -x '*.orig' dracut-056.org/dracut.sh dracut-056/dracut.sh +--- dracut-056.org/dracut.sh 2023-07-09 23:41:02.699912621 +0200 ++++ dracut-056/dracut.sh 2023-07-09 23:41:02.784913836 +0200 @@ -1186,13 +1186,6 @@ if [[ -f $dracutbasedir/dracut-version.s . "$dracutbasedir"/dracut-version.sh fi @@ -331,9 +331,9 @@ diff -urpa dracut-056.orig/dracut.sh dracut-056/dracut.sh -fi - exit 0 -diff -urpa dracut-056.orig/modules.d/01fips/fips.sh dracut-056/modules.d/01fips/fips.sh ---- dracut-056.orig/modules.d/01fips/fips.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/01fips/fips.sh 2022-08-30 00:01:50.073198984 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/01fips/fips.sh dracut-056/modules.d/01fips/fips.sh +--- dracut-056.org/modules.d/01fips/fips.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/01fips/fips.sh 2023-07-09 23:41:02.784913836 +0200 @@ -4,15 +4,9 @@ type getarg > /dev/null 2>&1 || . /lib/d # systemd lets stdout go to journal only, but the system @@ -353,9 +353,9 @@ diff -urpa dracut-056.orig/modules.d/01fips/fips.sh dracut-056/modules.d/01fips/ mount_boot() { boot=$(getarg boot=) -diff -urpa dracut-056.orig/modules.d/02caps/module-setup.sh dracut-056/modules.d/02caps/module-setup.sh ---- dracut-056.orig/modules.d/02caps/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/02caps/module-setup.sh 2022-08-29 23:46:09.489747726 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/02caps/module-setup.sh dracut-056/modules.d/02caps/module-setup.sh +--- dracut-056.org/modules.d/02caps/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/02caps/module-setup.sh 2023-07-09 23:41:02.784913836 +0200 @@ -14,12 +14,8 @@ depends() { # called by dracut @@ -373,9 +373,9 @@ diff -urpa dracut-056.orig/modules.d/02caps/module-setup.sh dracut-056/modules.d + # capsh wants bash and we need bash also + inst /bin/bash } -diff -urpa dracut-056.orig/modules.d/04watchdog/module-setup.sh dracut-056/modules.d/04watchdog/module-setup.sh ---- dracut-056.orig/modules.d/04watchdog/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/04watchdog/module-setup.sh 2022-08-29 23:49:02.214014930 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/04watchdog/module-setup.sh dracut-056/modules.d/04watchdog/module-setup.sh +--- dracut-056.org/modules.d/04watchdog/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/04watchdog/module-setup.sh 2023-07-09 23:41:02.784913836 +0200 @@ -15,20 +15,17 @@ depends() { install() { # Do not add watchdog hooks if systemd module is included @@ -408,9 +408,9 @@ diff -urpa dracut-056.orig/modules.d/04watchdog/module-setup.sh dracut-056/modul inst_hook emergency 02 "$moddir/watchdog-stop.sh" inst_multiple -o wdctl } -diff -urpa dracut-056.orig/modules.d/10i18n/console_init.sh dracut-056/modules.d/10i18n/console_init.sh ---- dracut-056.orig/modules.d/10i18n/console_init.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/10i18n/console_init.sh 2022-08-30 01:27:10.881161304 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/console_init.sh dracut-056/modules.d/10i18n/console_init.sh +--- dracut-056.org/modules.d/10i18n/console_init.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/10i18n/console_init.sh 2023-07-09 23:41:02.784913836 +0200 @@ -1,11 +1,5 @@ #!/bin/sh @@ -423,9 +423,9 @@ diff -urpa dracut-056.orig/modules.d/10i18n/console_init.sh dracut-056/modules.d [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf DEFAULT_FONT=eurlatgr -diff -urpa dracut-056.orig/modules.d/10i18n/module-setup.sh dracut-056/modules.d/10i18n/module-setup.sh ---- dracut-056.orig/modules.d/10i18n/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/10i18n/module-setup.sh 2022-08-29 23:49:56.738099274 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/10i18n/module-setup.sh dracut-056/modules.d/10i18n/module-setup.sh +--- dracut-056.org/modules.d/10i18n/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/10i18n/module-setup.sh 2023-07-09 23:41:02.784913836 +0200 @@ -18,13 +18,6 @@ depends() { install() { declare -A KEYMAPS @@ -489,9 +489,9 @@ diff -urpa dracut-056.orig/modules.d/10i18n/module-setup.sh dracut-056/modules.d if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} == "yes" ]]; then install_local_i18n || install_all_kbd else -diff -urpa dracut-056.orig/modules.d/35network-legacy/module-setup.sh dracut-056/modules.d/35network-legacy/module-setup.sh ---- dracut-056.orig/modules.d/35network-legacy/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/35network-legacy/module-setup.sh 2022-08-29 23:48:24.023955850 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/35network-legacy/module-setup.sh dracut-056/modules.d/35network-legacy/module-setup.sh +--- dracut-056.org/modules.d/35network-legacy/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/35network-legacy/module-setup.sh 2023-07-09 23:41:02.784913836 +0200 @@ -22,12 +22,6 @@ installkernel() { install() { local _arch @@ -505,9 +505,9 @@ diff -urpa dracut-056.orig/modules.d/35network-legacy/module-setup.sh dracut-056 inst_multiple ip dhclient sed awk grep pgrep tr expr inst_multiple -o arping arping2 -diff -urpa dracut-056.orig/modules.d/35network-legacy/net-genrules.sh dracut-056/modules.d/35network-legacy/net-genrules.sh ---- dracut-056.orig/modules.d/35network-legacy/net-genrules.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/35network-legacy/net-genrules.sh 2022-08-29 23:59:17.879964809 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/35network-legacy/net-genrules.sh dracut-056/modules.d/35network-legacy/net-genrules.sh +--- dracut-056.org/modules.d/35network-legacy/net-genrules.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/35network-legacy/net-genrules.sh 2023-07-09 23:41:02.784913836 +0200 @@ -102,11 +102,8 @@ command -v fix_bootif > /dev/null || . / for iface in $IFACES; do @@ -522,9 +522,9 @@ diff -urpa dracut-056.orig/modules.d/35network-legacy/net-genrules.sh dracut-056 fi done # Default: We don't know the interface to use, handle all -diff -urpa dracut-056.orig/modules.d/40network/module-setup.sh dracut-056/modules.d/40network/module-setup.sh ---- dracut-056.orig/modules.d/40network/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/40network/module-setup.sh 2022-08-29 23:39:01.349085410 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/40network/module-setup.sh dracut-056/modules.d/40network/module-setup.sh +--- dracut-056.org/modules.d/40network/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/40network/module-setup.sh 2023-07-09 23:41:02.784913836 +0200 @@ -9,23 +9,12 @@ check() { depends() { is_qemu_virtualized && echo -n "qemu-net " @@ -553,9 +553,9 @@ diff -urpa dracut-056.orig/modules.d/40network/module-setup.sh dracut-056/module fi echo "kernel-network-modules $network_handler" return 0 -diff -urpa dracut-056.orig/modules.d/40network/net-lib.sh dracut-056/modules.d/40network/net-lib.sh ---- dracut-056.orig/modules.d/40network/net-lib.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/40network/net-lib.sh 2022-08-30 01:56:14.047883232 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/40network/net-lib.sh dracut-056/modules.d/40network/net-lib.sh +--- dracut-056.org/modules.d/40network/net-lib.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/40network/net-lib.sh 2023-07-09 23:41:02.784913836 +0200 @@ -59,7 +59,7 @@ iface_name() { configured_ifaces() { local IFACES="" iface_id="" rv=1 @@ -565,9 +565,9 @@ diff -urpa dracut-056.orig/modules.d/40network/net-lib.sh dracut-056/modules.d/4 for iface_id in $IFACES; do printf "%s\n" "$(iface_name "$iface_id")" rv=0 -diff -urpa dracut-056.orig/modules.d/50plymouth/module-setup.sh dracut-056/modules.d/50plymouth/module-setup.sh ---- dracut-056.orig/modules.d/50plymouth/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/50plymouth/module-setup.sh 2022-08-29 23:49:11.145028746 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/50plymouth/module-setup.sh dracut-056/modules.d/50plymouth/module-setup.sh +--- dracut-056.org/modules.d/50plymouth/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/50plymouth/module-setup.sh 2023-07-09 23:41:02.784913836 +0200 @@ -44,8 +44,6 @@ install() { inst_multiple plymouthd plymouth plymouth-set-default-theme @@ -579,9 +579,9 @@ diff -urpa dracut-056.orig/modules.d/50plymouth/module-setup.sh dracut-056/modul + inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh + inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh } -diff -urpa dracut-056.orig/modules.d/90btrfs/module-setup.sh dracut-056/modules.d/90btrfs/module-setup.sh ---- dracut-056.orig/modules.d/90btrfs/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90btrfs/module-setup.sh 2022-08-29 23:45:54.430724429 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90btrfs/module-setup.sh dracut-056/modules.d/90btrfs/module-setup.sh +--- dracut-056.org/modules.d/90btrfs/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90btrfs/module-setup.sh 2023-07-09 23:41:02.785913850 +0200 @@ -43,9 +43,7 @@ install() { inst_rules 64-btrfs-dm.rules fi @@ -593,9 +593,9 @@ diff -urpa dracut-056.orig/modules.d/90btrfs/module-setup.sh dracut-056/modules. inst_multiple -o btrfsck btrfs-zero-log inst "$(command -v btrfs)" /sbin/btrfs -diff -urpa dracut-056.orig/modules.d/90crypt/crypt-lib.sh dracut-056/modules.d/90crypt/crypt-lib.sh ---- dracut-056.orig/modules.d/90crypt/crypt-lib.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90crypt/crypt-lib.sh 2022-08-30 00:31:11.632917988 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/crypt-lib.sh dracut-056/modules.d/90crypt/crypt-lib.sh +--- dracut-056.org/modules.d/90crypt/crypt-lib.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90crypt/crypt-lib.sh 2023-07-09 23:41:02.785913850 +0200 @@ -105,30 +105,22 @@ ask_for_password() { { @@ -641,9 +641,9 @@ diff -urpa dracut-056.orig/modules.d/90crypt/crypt-lib.sh dracut-056/modules.d/9 } 9> /.console_lock [ $ret -ne 0 ] && echo "Wrong password" >&2 -diff -urpa dracut-056.orig/modules.d/90crypt/crypt-run-generator.sh dracut-056/modules.d/90crypt/crypt-run-generator.sh ---- dracut-056.orig/modules.d/90crypt/crypt-run-generator.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90crypt/crypt-run-generator.sh 2022-08-30 00:00:07.766041555 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/crypt-run-generator.sh dracut-056/modules.d/90crypt/crypt-run-generator.sh +--- dracut-056.org/modules.d/90crypt/crypt-run-generator.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90crypt/crypt-run-generator.sh 2023-07-09 23:41:02.785913850 +0200 @@ -11,7 +11,7 @@ crypttab_contains "$luks" "$dev" && exit allowdiscards="-" @@ -662,9 +662,9 @@ diff -urpa dracut-056.orig/modules.d/90crypt/crypt-run-generator.sh dracut-056/m - systemctl start cryptsetup.target -fi exit 0 -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-08-28 19:27:11.079536407 +0200 -+++ dracut-056/modules.d/90crypt/module-setup.sh 2022-08-30 01:50:10.450316831 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/module-setup.sh dracut-056/modules.d/90crypt/module-setup.sh +--- dracut-056.org/modules.d/90crypt/module-setup.sh 2023-07-09 23:41:02.704912692 +0200 ++++ dracut-056/modules.d/90crypt/module-setup.sh 2023-07-09 23:41:02.785913850 +0200 @@ -4,7 +4,7 @@ check() { local fs @@ -733,9 +733,9 @@ diff -urpa dracut-056.orig/modules.d/90crypt/module-setup.sh dracut-056/modules. - dracut_need_initqueue } -diff -urpa dracut-056.orig/modules.d/90crypt/parse-crypt.sh dracut-056/modules.d/90crypt/parse-crypt.sh ---- dracut-056.orig/modules.d/90crypt/parse-crypt.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90crypt/parse-crypt.sh 2022-08-30 01:48:49.594190856 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90crypt/parse-crypt.sh dracut-056/modules.d/90crypt/parse-crypt.sh +--- dracut-056.org/modules.d/90crypt/parse-crypt.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90crypt/parse-crypt.sh 2023-07-09 23:41:02.785913850 +0200 @@ -36,12 +36,6 @@ else LUKS=$(getargs rd.luks.uuid -d rd_LUKS_UUID) tout=$(getarg rd.luks.key.tout) @@ -888,9 +888,9 @@ diff -urpa dracut-056.orig/modules.d/90crypt/parse-crypt.sh dracut-056/modules.d fi echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new -diff -urpa dracut-056.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-056/modules.d/90dmsquash-live/dmsquash-live-root.sh ---- dracut-056.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90dmsquash-live/dmsquash-live-root.sh 2022-08-30 00:32:12.334011986 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-056/modules.d/90dmsquash-live/dmsquash-live-root.sh +--- dracut-056.org/modules.d/90dmsquash-live/dmsquash-live-root.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90dmsquash-live/dmsquash-live-root.sh 2023-07-09 23:41:02.785913850 +0200 @@ -40,18 +40,11 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf" fi getarg rd.live.check -d check || check="" @@ -1010,9 +1010,9 @@ diff -urpa dracut-056.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracu fi [ -e "$SQUASHED" ] && umount -l /run/initramfs/squashfs -diff -urpa dracut-056.orig/modules.d/90dmsquash-live/module-setup.sh dracut-056/modules.d/90dmsquash-live/module-setup.sh ---- dracut-056.orig/modules.d/90dmsquash-live/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90dmsquash-live/module-setup.sh 2022-08-30 01:22:36.037730409 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90dmsquash-live/module-setup.sh dracut-056/modules.d/90dmsquash-live/module-setup.sh +--- dracut-056.org/modules.d/90dmsquash-live/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90dmsquash-live/module-setup.sh 2023-07-09 23:41:02.785913850 +0200 @@ -31,10 +31,6 @@ install() { inst_hook pre-pivot 20 "$moddir/apply-live-updates.sh" inst_script "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root" @@ -1024,9 +1024,9 @@ diff -urpa dracut-056.orig/modules.d/90dmsquash-live/module-setup.sh dracut-056/ # should probably just be generally included inst_rules 60-cdrom_id.rules dracut_need_initqueue -diff -urpa dracut-056.orig/modules.d/90kernel-modules/module-setup.sh dracut-056/modules.d/90kernel-modules/module-setup.sh ---- dracut-056.orig/modules.d/90kernel-modules/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90kernel-modules/module-setup.sh 2022-08-29 23:47:25.754865711 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90kernel-modules/module-setup.sh dracut-056/modules.d/90kernel-modules/module-setup.sh +--- dracut-056.org/modules.d/90kernel-modules/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90kernel-modules/module-setup.sh 2023-07-09 23:41:02.785913850 +0200 @@ -152,8 +152,6 @@ install() { [[ -d /lib/modprobe.d ]] && inst_multiple -o "/lib/modprobe.d/*.conf" [[ -d /usr/lib/modprobe.d ]] && inst_multiple -o "/usr/lib/modprobe.d/*.conf" @@ -1037,9 +1037,9 @@ diff -urpa dracut-056.orig/modules.d/90kernel-modules/module-setup.sh dracut-056 + inst_hook cmdline 01 "$moddir/parse-kernel.sh" inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh } -diff -urpa dracut-056.orig/modules.d/90livenet/module-setup.sh dracut-056/modules.d/90livenet/module-setup.sh ---- dracut-056.orig/modules.d/90livenet/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90livenet/module-setup.sh 2022-08-30 01:22:43.539742171 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90livenet/module-setup.sh dracut-056/modules.d/90livenet/module-setup.sh +--- dracut-056.org/modules.d/90livenet/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90livenet/module-setup.sh 2023-07-09 23:41:02.785913850 +0200 @@ -17,8 +17,5 @@ install() { inst_hook cmdline 29 "$moddir/parse-livenet.sh" inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh" @@ -1049,9 +1049,9 @@ diff -urpa dracut-056.orig/modules.d/90livenet/module-setup.sh dracut-056/module - fi dracut_need_initqueue } -diff -urpa dracut-056.orig/modules.d/90mdraid/module-setup.sh dracut-056/modules.d/90mdraid/module-setup.sh ---- dracut-056.orig/modules.d/90mdraid/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90mdraid/module-setup.sh 2022-08-29 23:45:43.188707041 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90mdraid/module-setup.sh dracut-056/modules.d/90mdraid/module-setup.sh +--- dracut-056.org/modules.d/90mdraid/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90mdraid/module-setup.sh 2023-07-09 23:41:02.785913850 +0200 @@ -121,20 +121,6 @@ install() { inst_hook shutdown 30 "$moddir/md-shutdown.sh" inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup @@ -1073,9 +1073,9 @@ diff -urpa dracut-056.orig/modules.d/90mdraid/module-setup.sh dracut-056/modules inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh" dracut_need_initqueue } -diff -urpa dracut-056.orig/modules.d/90multipath/module-setup.sh dracut-056/modules.d/90multipath/module-setup.sh ---- dracut-056.orig/modules.d/90multipath/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/90multipath/module-setup.sh 2022-08-29 23:46:41.394797087 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/90multipath/module-setup.sh dracut-056/modules.d/90multipath/module-setup.sh +--- dracut-056.org/modules.d/90multipath/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/90multipath/module-setup.sh 2023-07-09 23:41:02.786913864 +0200 @@ -132,17 +132,8 @@ install() { [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/90multipath.conf" fi @@ -1096,9 +1096,9 @@ diff -urpa dracut-056.orig/modules.d/90multipath/module-setup.sh dracut-056/modu inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh" inst_hook shutdown 20 "$moddir/multipath-shutdown.sh" -diff -urpa dracut-056.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-056/modules.d/91zipl/install_zipl_cmdline.sh ---- dracut-056.orig/modules.d/91zipl/install_zipl_cmdline.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/91zipl/install_zipl_cmdline.sh 2022-08-30 01:53:26.508622304 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/91zipl/install_zipl_cmdline.sh dracut-056/modules.d/91zipl/install_zipl_cmdline.sh +--- dracut-056.org/modules.d/91zipl/install_zipl_cmdline.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/91zipl/install_zipl_cmdline.sh 2023-07-09 23:41:02.786913864 +0200 @@ -30,10 +30,6 @@ fi umount ${MNT} @@ -1110,9 +1110,9 @@ diff -urpa dracut-056.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-056/m : > /tmp/install.zipl.cmdline-done exit 0 -diff -urpa dracut-056.orig/modules.d/95debug/module-setup.sh dracut-056/modules.d/95debug/module-setup.sh ---- dracut-056.orig/modules.d/95debug/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95debug/module-setup.sh 2022-08-30 01:51:43.760462213 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95debug/module-setup.sh dracut-056/modules.d/95debug/module-setup.sh +--- dracut-056.org/modules.d/95debug/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95debug/module-setup.sh 2023-07-09 23:41:02.786913864 +0200 @@ -15,7 +15,7 @@ depends() { install() { inst_multiple -o ls ps grep more cat rm strace free showmount df du lsblk \ @@ -1122,9 +1122,9 @@ diff -urpa dracut-056.orig/modules.d/95debug/module-setup.sh dracut-056/modules. 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-056.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-056/modules.d/95fcoe/cleanup-fcoe.sh ---- dracut-056.orig/modules.d/95fcoe/cleanup-fcoe.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95fcoe/cleanup-fcoe.sh 2022-08-30 00:01:38.521181213 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95fcoe/cleanup-fcoe.sh dracut-056/modules.d/95fcoe/cleanup-fcoe.sh +--- dracut-056.org/modules.d/95fcoe/cleanup-fcoe.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95fcoe/cleanup-fcoe.sh 2023-07-09 23:41:02.786913864 +0200 @@ -6,10 +6,8 @@ if [ -e /var/run/lldpad.pid ]; then lldpad -k # with systemd version 230, this is not necessary anymore @@ -1140,9 +1140,9 @@ diff -urpa dracut-056.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-056/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 -diff -urpa dracut-056.orig/modules.d/95fstab-sys/mount-sys.sh dracut-056/modules.d/95fstab-sys/mount-sys.sh ---- dracut-056.orig/modules.d/95fstab-sys/mount-sys.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95fstab-sys/mount-sys.sh 2022-08-29 23:58:56.546931985 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95fstab-sys/mount-sys.sh dracut-056/modules.d/95fstab-sys/mount-sys.sh +--- dracut-056.org/modules.d/95fstab-sys/mount-sys.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95fstab-sys/mount-sys.sh 2023-07-09 23:41:02.786913864 +0200 @@ -27,9 +27,7 @@ fstab_mount() { # systemd will mount and run fsck from /etc/fstab and we don't want to @@ -1154,9 +1154,9 @@ diff -urpa dracut-056.orig/modules.d/95fstab-sys/mount-sys.sh dracut-056/modules # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys if [ -f "$NEWROOT"/etc/fstab.sys ]; then -diff -urpa dracut-056.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-056/modules.d/95iscsi/cleanup-iscsi.sh ---- dracut-056.orig/modules.d/95iscsi/cleanup-iscsi.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95iscsi/cleanup-iscsi.sh 2022-08-30 00:02:04.813221666 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/cleanup-iscsi.sh dracut-056/modules.d/95iscsi/cleanup-iscsi.sh +--- dracut-056.org/modules.d/95iscsi/cleanup-iscsi.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95iscsi/cleanup-iscsi.sh 2023-07-09 23:41:02.786913864 +0200 @@ -1,5 +1,5 @@ #!/bin/sh @@ -1164,9 +1164,9 @@ diff -urpa dracut-056.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-056/modules +if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then killproc iscsiuio fi -diff -urpa dracut-056.orig/modules.d/95iscsi/iscsiroot.sh dracut-056/modules.d/95iscsi/iscsiroot.sh ---- dracut-056.orig/modules.d/95iscsi/iscsiroot.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95iscsi/iscsiroot.sh 2022-08-30 00:04:28.936443406 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/iscsiroot.sh dracut-056/modules.d/95iscsi/iscsiroot.sh +--- dracut-056.org/modules.d/95iscsi/iscsiroot.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95iscsi/iscsiroot.sh 2023-07-09 23:41:02.786913864 +0200 @@ -37,8 +37,7 @@ iroot=${iroot#:} modprobe crc32c 2> /dev/null @@ -1231,9 +1231,9 @@ diff -urpa dracut-056.orig/modules.d/95iscsi/iscsiroot.sh dracut-056/modules.d/9 fi if strglobin "$iscsi_target_ip" '*:*:*' && ! strglobin "$iscsi_target_ip" '['; then -diff -urpa dracut-056.orig/modules.d/95iscsi/module-setup.sh dracut-056/modules.d/95iscsi/module-setup.sh ---- dracut-056.orig/modules.d/95iscsi/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95iscsi/module-setup.sh 2022-08-30 01:38:50.480257424 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/module-setup.sh dracut-056/modules.d/95iscsi/module-setup.sh +--- dracut-056.org/modules.d/95iscsi/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95iscsi/module-setup.sh 2023-07-09 23:41:02.786913864 +0200 @@ -190,14 +190,6 @@ install() { inst_multiple umount iscsi-iname iscsiadm iscsid inst_binary sort @@ -1325,9 +1325,9 @@ diff -urpa dracut-056.orig/modules.d/95iscsi/module-setup.sh dracut-056/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 -diff -urpa dracut-056.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-056/modules.d/95iscsi/parse-iscsiroot.sh ---- dracut-056.orig/modules.d/95iscsi/parse-iscsiroot.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95iscsi/parse-iscsiroot.sh 2022-08-30 00:03:21.583339788 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95iscsi/parse-iscsiroot.sh dracut-056/modules.d/95iscsi/parse-iscsiroot.sh +--- dracut-056.org/modules.d/95iscsi/parse-iscsiroot.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95iscsi/parse-iscsiroot.sh 2023-07-09 23:41:02.786913864 +0200 @@ -41,7 +41,6 @@ if [ "${root%%:*}" = "iscsi" ]; then netroot=$root # if root is not specified try to mount the whole iSCSI LUN @@ -1386,9 +1386,9 @@ diff -urpa dracut-056.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-056/modul done # Done, all good! -diff -urpa dracut-056.orig/modules.d/95nbd/module-setup.sh dracut-056/modules.d/95nbd/module-setup.sh ---- dracut-056.orig/modules.d/95nbd/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95nbd/module-setup.sh 2022-08-30 01:22:13.502695076 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95nbd/module-setup.sh dracut-056/modules.d/95nbd/module-setup.sh +--- dracut-056.org/modules.d/95nbd/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95nbd/module-setup.sh 2023-07-09 23:41:02.786913864 +0200 @@ -32,8 +32,5 @@ install() { inst nbd-client inst_hook cmdline 90 "$moddir/parse-nbdroot.sh" @@ -1398,9 +1398,9 @@ diff -urpa dracut-056.orig/modules.d/95nbd/module-setup.sh dracut-056/modules.d/ - fi dracut_need_initqueue } -diff -urpa dracut-056.orig/modules.d/95nbd/nbdroot.sh dracut-056/modules.d/95nbd/nbdroot.sh ---- dracut-056.orig/modules.d/95nbd/nbdroot.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95nbd/nbdroot.sh 2022-08-30 01:41:57.958549518 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95nbd/nbdroot.sh dracut-056/modules.d/95nbd/nbdroot.sh +--- dracut-056.org/modules.d/95nbd/nbdroot.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95nbd/nbdroot.sh 2023-07-09 23:41:02.786913864 +0200 @@ -101,27 +101,13 @@ if [ "$root" = "block:/dev/root" -o "$ro udevadm control --reload wait_for_dev -n /dev/root @@ -1434,9 +1434,9 @@ diff -urpa dracut-056.orig/modules.d/95nbd/nbdroot.sh dracut-056/modules.d/95nbd fi if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then -diff -urpa dracut-056.orig/modules.d/95resume/module-setup.sh dracut-056/modules.d/95resume/module-setup.sh ---- dracut-056.orig/modules.d/95resume/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95resume/module-setup.sh 2022-08-29 23:50:05.938113509 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95resume/module-setup.sh dracut-056/modules.d/95resume/module-setup.sh +--- dracut-056.org/modules.d/95resume/module-setup.sh 2023-07-09 23:41:02.697912592 +0200 ++++ dracut-056/modules.d/95resume/module-setup.sh 2023-07-09 23:41:02.787913878 +0200 @@ -40,15 +40,6 @@ install() { [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf" fi @@ -1451,7 +1451,7 @@ diff -urpa dracut-056.orig/modules.d/95resume/module-setup.sh dracut-056/modules - fi - # Optional uswsusp support - for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib64/suspend/resume /usr/lib/uswsusp/resume /usr/lib64/uswsusp/resume; do + for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume; do [[ -x $dracutsysrootdir${_bin} ]] && { @@ -58,11 +49,7 @@ install() { } @@ -1466,9 +1466,9 @@ diff -urpa dracut-056.orig/modules.d/95resume/module-setup.sh dracut-056/modules inst_script "$moddir/resume.sh" /lib/dracut/resume.sh } -diff -urpa dracut-056.orig/modules.d/95rootfs-block/module-setup.sh dracut-056/modules.d/95rootfs-block/module-setup.sh ---- dracut-056.orig/modules.d/95rootfs-block/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95rootfs-block/module-setup.sh 2022-08-29 23:46:22.156767313 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95rootfs-block/module-setup.sh dracut-056/modules.d/95rootfs-block/module-setup.sh +--- dracut-056.org/modules.d/95rootfs-block/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95rootfs-block/module-setup.sh 2023-07-09 23:41:02.787913878 +0200 @@ -77,11 +77,9 @@ install() { inst_multiple umount @@ -1484,9 +1484,9 @@ diff -urpa dracut-056.orig/modules.d/95rootfs-block/module-setup.sh dracut-056/m inst_hook initqueue/timeout 99 "$moddir/rootfallback.sh" } -diff -urpa dracut-056.orig/modules.d/95udev-rules/module-setup.sh dracut-056/modules.d/95udev-rules/module-setup.sh ---- dracut-056.orig/modules.d/95udev-rules/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/95udev-rules/module-setup.sh 2022-08-30 01:26:13.553071427 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/95udev-rules/module-setup.sh dracut-056/modules.d/95udev-rules/module-setup.sh +--- dracut-056.org/modules.d/95udev-rules/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/95udev-rules/module-setup.sh 2023-07-09 23:41:02.787913878 +0200 @@ -11,18 +11,13 @@ install() { inst_dir /etc/udev inst_multiple -o /etc/udev/udev.conf @@ -1509,9 +1509,9 @@ diff -urpa dracut-056.orig/modules.d/95udev-rules/module-setup.sh dracut-056/mod exit 1 fi -diff -urpa dracut-056.orig/modules.d/98usrmount/module-setup.sh dracut-056/modules.d/98usrmount/module-setup.sh ---- dracut-056.orig/modules.d/98usrmount/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/98usrmount/module-setup.sh 2022-08-29 23:46:30.068779565 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/98usrmount/module-setup.sh dracut-056/modules.d/98usrmount/module-setup.sh +--- dracut-056.org/modules.d/98usrmount/module-setup.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/98usrmount/module-setup.sh 2023-07-09 23:41:02.787913878 +0200 @@ -13,8 +13,6 @@ depends() { # called by dracut @@ -1522,9 +1522,9 @@ diff -urpa dracut-056.orig/modules.d/98usrmount/module-setup.sh dracut-056/modul + inst_hook pre-pivot 50 "$moddir/mount-usr.sh" : } -diff -urpa dracut-056.orig/modules.d/99base/dracut-dev-lib.sh dracut-056/modules.d/99base/dracut-dev-lib.sh ---- dracut-056.orig/modules.d/99base/dracut-dev-lib.sh 2022-02-18 12:32:53.000000000 +0100 -+++ dracut-056/modules.d/99base/dracut-dev-lib.sh 2022-08-30 01:48:05.734122524 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-dev-lib.sh dracut-056/modules.d/99base/dracut-dev-lib.sh +--- dracut-056.org/modules.d/99base/dracut-dev-lib.sh 2022-02-18 12:32:53.000000000 +0100 ++++ dracut-056/modules.d/99base/dracut-dev-lib.sh 2023-07-09 23:41:02.787913878 +0200 @@ -25,11 +25,6 @@ str_replace() { dev_unit_name() { local dev="$1" @@ -1610,9 +1610,9 @@ diff -urpa dracut-056.orig/modules.d/99base/dracut-dev-lib.sh dracut-056/modules - /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload - fi } -diff -urpa dracut-056.orig/modules.d/99base/dracut-lib.sh dracut-056/modules.d/99base/dracut-lib.sh ---- dracut-056.orig/modules.d/99base/dracut-lib.sh 2022-08-28 19:16:30.263174545 +0200 -+++ dracut-056/modules.d/99base/dracut-lib.sh 2022-08-30 00:31:36.280956151 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/dracut-lib.sh dracut-056/modules.d/99base/dracut-lib.sh +--- dracut-056.org/modules.d/99base/dracut-lib.sh 2023-07-09 23:41:02.702912664 +0200 ++++ dracut-056/modules.d/99base/dracut-lib.sh 2023-07-09 23:41:02.787913878 +0200 @@ -2,7 +2,6 @@ type wait_for_dev > /dev/null 2>&1 || . /lib/dracut-dev-lib.sh @@ -1759,9 +1759,9 @@ diff -urpa dracut-056.orig/modules.d/99base/dracut-lib.sh dracut-056/modules.d/9 shift 2 fi -diff -urpa dracut-056.orig/modules.d/99base/init.sh dracut-056/modules.d/99base/init.sh ---- dracut-056.orig/modules.d/99base/init.sh 2022-08-28 19:16:30.263174545 +0200 -+++ dracut-056/modules.d/99base/init.sh 2022-08-30 01:26:56.596138918 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/init.sh dracut-056/modules.d/99base/init.sh +--- dracut-056.org/modules.d/99base/init.sh 2023-07-09 23:41:02.702912664 +0200 ++++ dracut-056/modules.d/99base/init.sh 2023-07-09 23:41:02.787913878 +0200 @@ -141,7 +141,7 @@ getargbool 0 rd.udev.info -d -y rdudevin getargbool 0 rd.udev.debug -d -y rdudevdebug && UDEV_LOG=debug @@ -1771,9 +1771,9 @@ diff -urpa dracut-056.orig/modules.d/99base/init.sh dracut-056/modules.d/99base/ UDEV_QUEUE_EMPTY="udevadm settle --timeout=0" -diff -urpa dracut-056.orig/modules.d/99base/module-setup.sh dracut-056/modules.d/99base/module-setup.sh ---- dracut-056.orig/modules.d/99base/module-setup.sh 2022-08-28 19:23:42.688085700 +0200 -+++ dracut-056/modules.d/99base/module-setup.sh 2022-08-29 23:51:05.024204902 +0200 +diff -urNp -x '*.orig' dracut-056.org/modules.d/99base/module-setup.sh dracut-056/modules.d/99base/module-setup.sh +--- dracut-056.org/modules.d/99base/module-setup.sh 2023-07-09 23:41:02.703912678 +0200 ++++ dracut-056/modules.d/99base/module-setup.sh 2023-07-09 23:41:02.787913878 +0200 @@ -53,11 +53,8 @@ install() { inst_simple "$moddir/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" mkdir -p "${initdir}"/var -- 2.44.0