Summary: Initramfs generator using udev
Summary(pl.UTF-8): Generator initramfs wykorzystujący udev
Name: dracut
-Version: 106
+Version: 111
Release: 1
License: GPL v2+
Group: Base
-Source0: https://github.com/dracut-ng/dracut-ng/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f84b20c030178b4a28d2a194701f50cf
+Source0: https://github.com/dracut-ng/dracut/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 5566a97143feb0a3005b4d2184023063
Source1: tld.conf
Source2: update-initramfs
-Patch1: arch-libdir.patch
Patch2: config.patch
Patch3: compressors.patch
Patch4: proc_sys_remount.patch
Patch7: crypttab-keyscript.patch
Patch8: bash.patch
Patch100: no_systemd.patch
-URL: https://github.com/dracut-ng/dracut-ng/wiki
+URL: https://github.com/dracut-ng/dracut/wiki
BuildRequires: asciidoc
+BuildRequires: cargo
BuildRequires: dash
BuildRequires: docbook-dtd45-xml
BuildRequires: docbook-style-xsl
Bashowe dopełnianie składni dla polecenia dracut.
%prep
-%setup -q -n dracut-ng-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch100 -p1
-
-%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
+%setup -q
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
+%patch -P100 -p1
+
+%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/74resume/module-setup.sh
find modules.d -name '*.orig' | xargs -r %{__rm}
%build
# not autoconf generated
./configure \
- --sysconfdir=%{_sysconfdir}
+ --sysconfdir=%{_sysconfdir} \
+ --enable-network-legacy
%{__make} all doc \
CC="%{__cc}" \
ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
# remove foreign arch modules
-%ifnarch ppc ppc64
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90ppcmac
-%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}/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
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/70ppcmac
-# remove modules requiring systemd
-%{__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 .service and related files
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/35network-manager/nm-initrd.service
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/35network-manager/nm-wait-online-initrd.service
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/70dmsquash-live/checkisomd5@.service
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/70multipath/multipathd-configure.service
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/77initqueue/dracut-initqueue.service*
# remove unneded files
%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/45plymouth
%{__rm} -r $RPM_BUILD_ROOT/usr/lib/kernel/install.d/*.install
-%{__rm} -r $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d/*.example
+
%clean
rm -rf $RPM_BUILD_ROOT
%{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-cpio
%attr(755,root,root) %{dracutlibdir}/dracut-install
%attr(755,root,root) %{dracutlibdir}/dracut-util
%dir %{dracutlibdir}/modules.d
%attr(755,root,root) %{dracutlibdir}/dracut-functions.sh
%attr(755,root,root) %{dracutlibdir}/dracut-functions
-%attr(755,root,root) %{dracutlibdir}/dracut-init.sh
%attr(755,root,root) %{dracutlibdir}/dracut-logger.sh
%attr(755,root,root) %{dracutlibdir}/dracut-initramfs-restore
-%dir %{dracutlibdir}/modules.d/00bash
-%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/00warpclock
-%attr(755,root,root) %{dracutlibdir}/modules.d/00warpclock/*.sh
-%dir %{dracutlibdir}/modules.d/03modsign
-%attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh
-%dir %{dracutlibdir}/modules.d/03rescue
-%attr(755,root,root) %{dracutlibdir}/modules.d/03rescue/module-setup.sh
-%dir %{dracutlibdir}/modules.d/04watchdog
-%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/10i18n
-%{dracutlibdir}/modules.d/10i18n/README
-%{dracutlibdir}/modules.d/10i18n/*.rules
-%attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh
+%dir %{dracutlibdir}/modules.d/10bash
+%attr(755,root,root) %{dracutlibdir}/modules.d/10bash/module-setup.sh
+%dir %{dracutlibdir}/modules.d/10dash
+%attr(755,root,root) %{dracutlibdir}/modules.d/10dash/*.sh
+%dir %{dracutlibdir}/modules.d/10warpclock
+%attr(755,root,root) %{dracutlibdir}/modules.d/10warpclock/*.sh
+%dir %{dracutlibdir}/modules.d/13modsign
+%attr(755,root,root) %{dracutlibdir}/modules.d/13modsign/*.sh
+%dir %{dracutlibdir}/modules.d/13rescue
+%attr(755,root,root) %{dracutlibdir}/modules.d/13rescue/module-setup.sh
+%dir %{dracutlibdir}/modules.d/14watchdog
+%attr(755,root,root) %{dracutlibdir}/modules.d/14watchdog/*.sh
+%dir %{dracutlibdir}/modules.d/14watchdog-modules
+%attr(755,root,root) %{dracutlibdir}/modules.d/14watchdog-modules/module-setup.sh
+%dir %{dracutlibdir}/modules.d/20i18n
+%{dracutlibdir}/modules.d/20i18n/README
+%{dracutlibdir}/modules.d/20i18n/*.rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/20i18n/*.sh
%dir %{dracutlibdir}/modules.d/30convertfs
%attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh
%dir %{dracutlibdir}/modules.d/45drm
%attr(755,root,root) %{dracutlibdir}/modules.d/45drm/module-setup.sh
-%dir %{dracutlibdir}/modules.d/90btrfs
-%{dracutlibdir}/modules.d/90btrfs/*.rules
-%attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh
-%dir %{dracutlibdir}/modules.d/90crypt
-%attr(755,root,root) %{dracutlibdir}/modules.d/90crypt/*.sh
-%dir %{dracutlibdir}/modules.d/90dm
-%{dracutlibdir}/modules.d/90dm/*.rules
-%attr(755,root,root) %{dracutlibdir}/modules.d/90dm/*.sh
-%dir %{dracutlibdir}/modules.d/90dmraid
-%{dracutlibdir}/modules.d/90dmraid/*.rules
-%attr(755,root,root) %{dracutlibdir}/modules.d/90dmraid/*.sh
-%dir %{dracutlibdir}/modules.d/90dmsquash-live
-%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live/*.sh
-%dir %{dracutlibdir}/modules.d/90dmsquash-live-autooverlay
-%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live-autooverlay/*.sh
-%dir %{dracutlibdir}/modules.d/90dmsquash-live-ntfs
-%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live-ntfs/*.sh
-%dir %{dracutlibdir}/modules.d/90kernel-modules
-%attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules/*.sh
-%dir %{dracutlibdir}/modules.d/90kernel-modules-extra
-%attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules-extra/*.sh
-%dir %{dracutlibdir}/modules.d/90lvm
-%{dracutlibdir}/modules.d/90lvm/*.rules
-%attr(755,root,root) %{dracutlibdir}/modules.d/90lvm/*.sh
-%dir %{dracutlibdir}/modules.d/90mdraid
-%{dracutlibdir}/modules.d/90mdraid/*.rules
-%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/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
-%{dracutlibdir}/modules.d/91crypt-gpg/README
-%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/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
-%attr(755,root,root) %{dracutlibdir}/modules.d/95rootfs-block/*.rules
-%attr(755,root,root) %{dracutlibdir}/modules.d/95rootfs-block/*.sh
-%dir %{dracutlibdir}/modules.d/95fcoe-uefi
-%attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe-uefi/*.sh
-%dir %{dracutlibdir}/modules.d/95fstab-sys
-%attr(755,root,root) %{dracutlibdir}/modules.d/95fstab-sys/*.sh
-%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/95virtiofs
-%attr(755,root,root) %{dracutlibdir}/modules.d/95virtiofs/*.sh
-%dir %{dracutlibdir}/modules.d/95terminfo
-%attr(755,root,root) %{dracutlibdir}/modules.d/95terminfo/*.sh
-%dir %{dracutlibdir}/modules.d/95udev-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
-%dir %{dracutlibdir}/modules.d/96securityfs
-%attr(755,root,root) %{dracutlibdir}/modules.d/96securityfs/*.sh
-%dir %{dracutlibdir}/modules.d/97biosdevname
-%attr(755,root,root) %{dracutlibdir}/modules.d/97biosdevname/*.sh
-%dir %{dracutlibdir}/modules.d/97masterkey
-%{dracutlibdir}/modules.d/97masterkey/README
-%attr(755,root,root) %{dracutlibdir}/modules.d/97masterkey/*.sh
-%dir %{dracutlibdir}/modules.d/98ecryptfs
-%{dracutlibdir}/modules.d/98ecryptfs/README
-%attr(755,root,root) %{dracutlibdir}/modules.d/98ecryptfs/*.sh
-%dir %{dracutlibdir}/modules.d/98integrity
-%{dracutlibdir}/modules.d/98integrity/README
-%attr(755,root,root) %{dracutlibdir}/modules.d/98integrity/*.sh
-%dir %{dracutlibdir}/modules.d/98pollcdrom
-%attr(755,root,root) %{dracutlibdir}/modules.d/98pollcdrom/*.sh
-%dir %{dracutlibdir}/modules.d/98selinux
-%attr(755,root,root) %{dracutlibdir}/modules.d/98selinux/*.sh
-%dir %{dracutlibdir}/modules.d/98syslog
-%{dracutlibdir}/modules.d/98syslog/README
-%{dracutlibdir}/modules.d/98syslog/rsyslog.conf
-%attr(755,root,root) %{dracutlibdir}/modules.d/98syslog/*.sh
-%dir %{dracutlibdir}/modules.d/98usrmount
-%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/99shell-interpreter
-%attr(755,root,root) %{dracutlibdir}/modules.d/99shell-interpreter/module-setup.sh
-%dir %{dracutlibdir}/modules.d/99shutdown
-%attr(755,root,root) %{dracutlibdir}/modules.d/99shutdown/*.sh
-%dir %{dracutlibdir}/modules.d/99uefi-lib
-%attr(755,root,root) %{dracutlibdir}/modules.d/99uefi-lib/*.sh
+%dir %{dracutlibdir}/modules.d/45simpledrm
+%attr(755,root,root) %{dracutlibdir}/modules.d/45simpledrm/module-setup.sh
+%dir %{dracutlibdir}/modules.d/70btrfs
+%{dracutlibdir}/modules.d/70btrfs/*.rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/70btrfs/*.sh
+%dir %{dracutlibdir}/modules.d/70crypt
+%attr(755,root,root) %{dracutlibdir}/modules.d/70crypt/*.sh
+%dir %{dracutlibdir}/modules.d/70crypt-lib
+%attr(755,root,root) %{dracutlibdir}/modules.d/70crypt-lib/*.sh
+%dir %{dracutlibdir}/modules.d/70devicetree-firmware
+%attr(755,root,root) %{dracutlibdir}/modules.d/70devicetree-firmware/*.sh
+%dir %{dracutlibdir}/modules.d/70dm
+%{dracutlibdir}/modules.d/70dm/*.rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/70dm/*.sh
+%dir %{dracutlibdir}/modules.d/70dmraid
+%{dracutlibdir}/modules.d/70dmraid/*.rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/70dmraid/*.sh
+%dir %{dracutlibdir}/modules.d/70dmsquash-live
+%attr(755,root,root) %{dracutlibdir}/modules.d/70dmsquash-live/*.sh
+%dir %{dracutlibdir}/modules.d/70dmsquash-live-autooverlay
+%attr(755,root,root) %{dracutlibdir}/modules.d/70dmsquash-live-autooverlay/*.sh
+%dir %{dracutlibdir}/modules.d/70dmsquash-live-ntfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/70dmsquash-live-ntfs/*.sh
+%dir %{dracutlibdir}/modules.d/70fs-lib
+%attr(755,root,root) %{dracutlibdir}/modules.d/70fs-lib/*.sh
+%dir %{dracutlibdir}/modules.d/70img-lib
+%attr(755,root,root) %{dracutlibdir}/modules.d/70img-lib/*.sh
+%dir %{dracutlibdir}/modules.d/70kernel-modules
+%attr(755,root,root) %{dracutlibdir}/modules.d/70kernel-modules/*.sh
+%dir %{dracutlibdir}/modules.d/70kernel-modules-export
+%attr(755,root,root) %{dracutlibdir}/modules.d/70kernel-modules-export/*.sh
+%dir %{dracutlibdir}/modules.d/70kernel-modules-extra
+%attr(755,root,root) %{dracutlibdir}/modules.d/70kernel-modules-extra/*.sh
+%dir %{dracutlibdir}/modules.d/70lvm
+%{dracutlibdir}/modules.d/70lvm/*.rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/70lvm/*.sh
+%dir %{dracutlibdir}/modules.d/70mdraid
+%{dracutlibdir}/modules.d/70mdraid/*.rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/70mdraid/*.sh
+%dir %{dracutlibdir}/modules.d/70memdisk
+%attr(755,root,root) %{dracutlibdir}/modules.d/70memdisk/*.sh
+%dir %{dracutlibdir}/modules.d/70multipath
+%{dracutlibdir}/modules.d/70multipath/*.conf
+%attr(755,root,root) %{dracutlibdir}/modules.d/70multipath/*.sh
+%dir %{dracutlibdir}/modules.d/70numlock
+%attr(755,root,root) %{dracutlibdir}/modules.d/70numlock/*.sh
+%dir %{dracutlibdir}/modules.d/70nvdimm
+%attr(755,root,root) %{dracutlibdir}/modules.d/70nvdimm/module-setup.sh
+%dir %{dracutlibdir}/modules.d/70overlayfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/70overlayfs/*.sh
+%dir %{dracutlibdir}/modules.d/70pcmcia
+%attr(755,root,root) %{dracutlibdir}/modules.d/70pcmcia/module-setup.sh
+%dir %{dracutlibdir}/modules.d/70qemu
+%attr(755,root,root) %{dracutlibdir}/modules.d/70qemu/*.sh
+%dir %{dracutlibdir}/modules.d/70uefi-lib
+%attr(755,root,root) %{dracutlibdir}/modules.d/70uefi-lib/*.sh
+%dir %{dracutlibdir}/modules.d/71overlayfs-crypt
+%attr(755,root,root) %{dracutlibdir}/modules.d/71overlayfs-crypt/*.sh
+%dir %{dracutlibdir}/modules.d/73crypt-gpg
+%{dracutlibdir}/modules.d/73crypt-gpg/README
+%attr(755,root,root) %{dracutlibdir}/modules.d/73crypt-gpg/*.sh
+%dir %{dracutlibdir}/modules.d/73crypt-loop
+%attr(755,root,root) %{dracutlibdir}/modules.d/73crypt-loop/*.sh
+%dir %{dracutlibdir}/modules.d/74debug
+%attr(755,root,root) %{dracutlibdir}/modules.d/74debug/*.sh
+%dir %{dracutlibdir}/modules.d/74hwdb
+%attr(755,root,root) %{dracutlibdir}/modules.d/74hwdb/module-setup.sh
+%dir %{dracutlibdir}/modules.d/74lunmask
+%attr(755,root,root) %{dracutlibdir}/modules.d/74lunmask/*.sh
+%dir %{dracutlibdir}/modules.d/74fcoe-uefi
+%attr(755,root,root) %{dracutlibdir}/modules.d/74fcoe-uefi/*.sh
+%dir %{dracutlibdir}/modules.d/74fstab-sys
+%attr(755,root,root) %{dracutlibdir}/modules.d/74fstab-sys/*.sh
+%dir %{dracutlibdir}/modules.d/74nvmf
+%attr(755,root,root) %{dracutlibdir}/modules.d/74nvmf/*.sh
+%{dracutlibdir}/modules.d/74nvmf/95-nvmf-initqueue.rules
+%dir %{dracutlibdir}/modules.d/74resume
+%attr(755,root,root) %{dracutlibdir}/modules.d/74resume/*.sh
+%dir %{dracutlibdir}/modules.d/74rootfs-block
+%attr(755,root,root) %{dracutlibdir}/modules.d/74rootfs-block/*.rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/74rootfs-block/*.sh
+%dir %{dracutlibdir}/modules.d/74rootfs-block-fallback
+%attr(755,root,root) %{dracutlibdir}/modules.d/74rootfs-block-fallback/*.sh
+%dir %{dracutlibdir}/modules.d/74virtiofs
+%attr(755,root,root) %{dracutlibdir}/modules.d/74virtiofs/*.sh
+%dir %{dracutlibdir}/modules.d/74terminfo
+%attr(755,root,root) %{dracutlibdir}/modules.d/74terminfo/*.sh
+%dir %{dracutlibdir}/modules.d/74udev-rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/74udev-rules/*.sh
+%dir %{dracutlibdir}/modules.d/74virtfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/74virtfs/*.sh
+%dir %{dracutlibdir}/modules.d/75securityfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/75securityfs/*.sh
+%dir %{dracutlibdir}/modules.d/76biosdevname
+%attr(755,root,root) %{dracutlibdir}/modules.d/76biosdevname/*.sh
+%dir %{dracutlibdir}/modules.d/76masterkey
+%{dracutlibdir}/modules.d/76masterkey/README
+%attr(755,root,root) %{dracutlibdir}/modules.d/76masterkey/*.sh
+%dir %{dracutlibdir}/modules.d/77ecryptfs
+%{dracutlibdir}/modules.d/77ecryptfs/README
+%attr(755,root,root) %{dracutlibdir}/modules.d/77ecryptfs/*.sh
+%dir %{dracutlibdir}/modules.d/77initqueue
+%attr(755,root,root) %{dracutlibdir}/modules.d/77initqueue/*.sh
+%dir %{dracutlibdir}/modules.d/77integrity
+%{dracutlibdir}/modules.d/77integrity/README
+%attr(755,root,root) %{dracutlibdir}/modules.d/77integrity/*.sh
+%dir %{dracutlibdir}/modules.d/77pollcdrom
+%attr(755,root,root) %{dracutlibdir}/modules.d/77pollcdrom/*.sh
+%dir %{dracutlibdir}/modules.d/77selinux
+%attr(755,root,root) %{dracutlibdir}/modules.d/77selinux/*.sh
+%dir %{dracutlibdir}/modules.d/77syslog
+%{dracutlibdir}/modules.d/77syslog/README
+%{dracutlibdir}/modules.d/77syslog/rsyslog.conf
+%attr(755,root,root) %{dracutlibdir}/modules.d/77syslog/*.sh
+%dir %{dracutlibdir}/modules.d/77usrmount
+%attr(755,root,root) %{dracutlibdir}/modules.d/77usrmount/*.sh
+%dir %{dracutlibdir}/modules.d/80base
+%attr(755,root,root) %{dracutlibdir}/modules.d/80base/*.sh
+%dir %{dracutlibdir}/modules.d/81busybox
+%attr(755,root,root) %{dracutlibdir}/modules.d/81busybox/module-setup.sh
+%dir %{dracutlibdir}/modules.d/85shell-interpreter
+%attr(755,root,root) %{dracutlibdir}/modules.d/85shell-interpreter/module-setup.sh
+%dir %{dracutlibdir}/modules.d/86shutdown
+%attr(755,root,root) %{dracutlibdir}/modules.d/86shutdown/*.sh
%attr(755,root,root) %{dracutlibdir}/dracut-version.sh
%attr(755,root,root) %{dracutlibdir}/skipcpio
%dir %{dracutlibdir}/modules.d/35network-legacy
%{dracutlibdir}/modules.d/35network-legacy/dhclient.conf
%attr(755,root,root) %{dracutlibdir}/modules.d/35network-legacy/*.sh
+%dir %{dracutlibdir}/modules.d/35network-manager
+%{dracutlibdir}/modules.d/35network-manager/*.conf
+%attr(755,root,root) %{dracutlibdir}/modules.d/35network-manager/*.sh
%dir %{dracutlibdir}/modules.d/40network
%attr(755,root,root) %{dracutlibdir}/modules.d/40network/*.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
-%attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-network-modules/module-setup.sh
-%dir %{dracutlibdir}/modules.d/90livenet
-%attr(755,root,root) %{dracutlibdir}/modules.d/90livenet/*.sh
+%dir %{dracutlibdir}/modules.d/70kernel-network-modules
+%attr(755,root,root) %{dracutlibdir}/modules.d/70kernel-network-modules/module-setup.sh
+%dir %{dracutlibdir}/modules.d/70livenet
+%attr(755,root,root) %{dracutlibdir}/modules.d/70livenet/*.sh
%ifarch ppc ppc64
-%dir %{dracutlibdir}/modules.d/90ppcmac
-%attr(755,root,root) %{dracutlibdir}/modules.d/90ppcmac/*.sh
+%dir %{dracutlibdir}/modules.d/70ppcmac
+%attr(755,root,root) %{dracutlibdir}/modules.d/70ppcmac/*.sh
%endif
-%dir %{dracutlibdir}/modules.d/90qemu-net
-%attr(755,root,root) %{dracutlibdir}/modules.d/90qemu-net/*.sh
-%dir %{dracutlibdir}/modules.d/95cifs
-%attr(755,root,root) %{dracutlibdir}/modules.d/95cifs/*.sh
-%dir %{dracutlibdir}/modules.d/95fcoe
-%attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe/*.sh
-%dir %{dracutlibdir}/modules.d/95iscsi
-%attr(755,root,root) %{dracutlibdir}/modules.d/95iscsi/*.sh
-%dir %{dracutlibdir}/modules.d/95nbd
-%attr(755,root,root) %{dracutlibdir}/modules.d/95nbd/*.sh
-%dir %{dracutlibdir}/modules.d/95nfs
-%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/70qemu-net
+%attr(755,root,root) %{dracutlibdir}/modules.d/70qemu-net/*.sh
+%dir %{dracutlibdir}/modules.d/74cifs
+%attr(755,root,root) %{dracutlibdir}/modules.d/74cifs/*.sh
+%dir %{dracutlibdir}/modules.d/74fcoe
+%attr(755,root,root) %{dracutlibdir}/modules.d/74fcoe/*.sh
+%dir %{dracutlibdir}/modules.d/74iscsi
+%attr(755,root,root) %{dracutlibdir}/modules.d/74iscsi/*.sh
+%dir %{dracutlibdir}/modules.d/74nbd
+%attr(755,root,root) %{dracutlibdir}/modules.d/74nbd/*.sh
+%dir %{dracutlibdir}/modules.d/74nfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/74nfs/*.sh
+%dir %{dracutlibdir}/modules.d/74ssh-client
+%attr(755,root,root) %{dracutlibdir}/modules.d/74ssh-client/*.sh
%files fips
%defattr(644,root,root,755)
-%dir %{dracutlibdir}/modules.d/01fips
-%attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh
-%{dracutlibdir}/modules.d/01fips/openssl.cnf
-%dir %{dracutlibdir}/modules.d/01fips-crypto-policies
-%attr(755,root,root) %{dracutlibdir}/modules.d/01fips-crypto-policies/*.sh
+%dir %{dracutlibdir}/modules.d/11fips
+%attr(755,root,root) %{dracutlibdir}/modules.d/11fips/*.sh
+%{dracutlibdir}/modules.d/11fips/openssl.cnf
+%dir %{dracutlibdir}/modules.d/11fips-crypto-policies
+%attr(755,root,root) %{dracutlibdir}/modules.d/11fips-crypto-policies/*.sh
%{dracutlibdir}/dracut.conf.d/fips
%files caps
%defattr(644,root,root,755)
-%{dracutlibdir}/modules.d/02caps/README
-%dir %{dracutlibdir}/modules.d/02caps
-%attr(755,root,root) %{dracutlibdir}/modules.d/02caps/*.sh
+%{dracutlibdir}/modules.d/12caps/README
+%dir %{dracutlibdir}/modules.d/12caps
+%attr(755,root,root) %{dracutlibdir}/modules.d/12caps/*.sh
%files tools
%defattr(644,root,root,755)
-diff -ur dracut-ng-106.orig/dracut-init.sh dracut-ng-106/dracut-init.sh
---- dracut-ng-106.orig/dracut-init.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/dracut-init.sh 2025-04-19 11:33:25.458453270 +0200
-@@ -1078,15 +1078,6 @@
- is_qemu_virtualized() {
- # 0 if a virt environment was detected
- # 1 if a virt environment could not be detected
-- # 255 if any error was encountered
-- if type -P systemd-detect-virt > /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
-
- for i in /sys/class/dmi/id/*_vendor; do
- [[ -f $i ]] || continue
-diff -ur dracut-ng-106.orig/dracut-logger.sh dracut-ng-106/dracut-logger.sh
---- dracut-ng-106.orig/dracut-logger.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/dracut-logger.sh 2025-04-19 11:33:25.458453270 +0200
-@@ -142,16 +142,7 @@
+diff -ur dracut-111.orig/dracut.conf.d/no-network/10-no-network.conf dracut-111/dracut.conf.d/no-network/10-no-network.conf
+--- dracut-111.orig/dracut.conf.d/no-network/10-no-network.conf 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/dracut.conf.d/no-network/10-no-network.conf 2026-05-19 20:14:20.692518545 +0200
+@@ -1,3 +1,3 @@
+ # ensure networking is not included in the generated initrd
+-# all networking dracut modules either depend on net-lib or systemd-networkd
+-omit_dracutmodules+=" net-lib systemd-networkd "
++# all networking dracut modules either depend on net-lib
++omit_dracutmodules+=" net-lib "
+diff -ur dracut-111.orig/dracut-logger.sh dracut-111/dracut-logger.sh
+--- dracut-111.orig/dracut-logger.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/dracut-logger.sh 2026-05-19 19:03:13.758487629 +0200
+@@ -140,16 +140,7 @@
fi
if ((sysloglvl > 0)); then
- && type -P systemd-cat &> /dev/null \
- && systemctl --quiet is-active systemd-journald.socket &> /dev/null \
- && { echo "dracut-$DRACUT_VERSION" | systemd-cat -t 'dracut' &> /dev/null; }; then
-- readonly _systemdcatfile="$DRACUT_TMPDIR/systemd-cat"
+- readonly _systemdcatfile="${DRACUT_TMPDIR:-${dracutsysrootdir-}/var/tmp}/systemd-cat"
- mkfifo "$_systemdcatfile"
- readonly _dlogfd=15
- systemd-cat -t 'dracut' --level-prefix=true < "$_systemdcatfile" &
- elif ! ([[ -S /dev/log ]] && [[ -w /dev/log ]] && command -v logger > /dev/null); then
+ if ! ([[ -S /dev/log ]] && [[ -w /dev/log ]] && command -v logger > /dev/null); then
# We cannot log to syslog, so turn this facility off.
- kmsgloglvl=$sysloglvl
- sysloglvl=0
-diff -ur dracut-ng-106.orig/dracut.sh dracut-ng-106/dracut.sh
---- dracut-ng-106.orig/dracut.sh 2025-04-19 11:24:36.317252742 +0200
-+++ dracut-ng-106/dracut.sh 2025-04-19 11:33:25.458453270 +0200
-@@ -1375,13 +1375,6 @@
- . "$dracutbasedir"/dracut-version.sh
+ if [[ -w /dev/kmsg ]]; then
+ kmsgloglvl=$sysloglvl
+diff -ur dracut-111.orig/dracut.sh dracut-111/dracut.sh
+--- dracut-111.orig/dracut.sh 2026-05-19 18:20:47.450962049 +0200
++++ dracut-111/dracut.sh 2026-05-19 20:11:40.635838885 +0200
+@@ -982,13 +982,7 @@
+ export add_dlopen_features="" omit_dlopen_features=""
+
+ if ! [[ $kernel ]] && [[ $regenerate_all_l != "yes" ]]; then
+- if [[ -z ${dracutsysrootdir-} ]] \
+- && type -P systemd-detect-virt &> /dev/null && ! systemd-detect-virt -c &> /dev/null && ! systemd-detect-virt -r &> /dev/null; then
+- kernel="$(uname -r)"
+- else
+- # shellcheck disable=SC2012
+- kernel="$(cd "${dracutsysrootdir-}"/lib/modules && ls -1v | tail -1)"
+- fi
++ kernel="$(uname -r)"
+ fi
+
+ # if we were not passed a config file, try the default one
+@@ -2018,11 +2012,6 @@
+ }
fi
--if systemd-detect-virt -c &> /dev/null; then
+-if type -P systemd-detect-virt &> /dev/null && container=$(systemd-detect-virt -c) &> /dev/null; then
- export DRACUT_NO_MKNOD=1
-- if [[ $hostonly ]]; then
-- printf "%s\n" "dracut[W]: Running in hostonly mode in a container!" >&2
-- fi
+- dinfo "Detected $container container."
-fi
-
- if [[ -f $dracutbasedir/dracut-init.sh ]]; then
- # shellcheck source=./dracut-init.sh
- . "$dracutbasedir"/dracut-init.sh
-@@ -1505,52 +1498,12 @@
+ if [[ $persistent_policy == "mapper" ]]; then
+ unset persistent_policy
+ elif [[ -n $persistent_policy && ! -d "/dev/disk/${persistent_policy}" ]]; then
+@@ -2153,52 +2142,11 @@
fi
}
-# dbus global variables
-set_global_var "dbus" "dbus" "/usr/share/dbus-1"
--set_global_var "dbus" "dbusconfdir" "/etc/dbus-1"
+-[[ $hostonly ]] && set_global_var "dbus" "dbusconfdir" "/etc/dbus-1"
-set_global_var "dbus" "dbusinterfaces" "${dbus}/interfaces"
--set_global_var "dbus" "dbusinterfacesconfdir" "${dbusconfdir}/interfaces"
+-[[ $hostonly ]] && set_global_var "dbus" "dbusinterfacesconfdir" "${dbusconfdir}/interfaces"
-set_global_var "dbus" "dbusservices" "${dbus}/services"
--set_global_var "dbus" "dbusservicesconfdir" "${dbusconfdir}/services"
+-[[ $hostonly ]] && set_global_var "dbus" "dbusservicesconfdir" "${dbusconfdir}/services"
-set_global_var "dbus" "dbussession" "${dbus}/session.d"
--set_global_var "dbus" "dbussessionconfdir" "${dbusconfdir}/session.d"
+-[[ $hostonly ]] && set_global_var "dbus" "dbussessionconfdir" "${dbusconfdir}/session.d"
-set_global_var "dbus" "dbussystem" "${dbus}/system.d"
--set_global_var "dbus" "dbussystemconfdir" "${dbusconfdir}/system.d"
+-[[ $hostonly ]] && set_global_var "dbus" "dbussystemconfdir" "${dbusconfdir}/system.d"
-set_global_var "dbus" "dbussystemservices" "${dbus}/system-services"
--set_global_var "dbus" "dbussystemservicesconfdir" "${dbusconfdir}/system-services"
+-[[ $hostonly ]] && 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"
+ [[ $hostonly ]] && 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"
+-[[ $hostonly ]] && set_global_var "systemd" "systemdutilconfdir" "/etc/systemd"
-set_global_var "systemd" "environment" "/usr/lib/environment.d"
--set_global_var "systemd" "environmentconfdir" "/etc/environment.d"
+-[[ $hostonly ]] && 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"
+-[[ $hostonly ]] && 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"
+-[[ $hostonly ]] && 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"
+-[[ $hostonly ]] && 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"
+-[[ $hostonly ]] && set_global_var "systemd" "systemdntpunitsconfdir" "${systemdutilconfdir}/ntp-units.d"
-set_global_var "systemd" "systemdportable" "${systemdutildir}/portable"
--set_global_var "systemd" "systemdportableconfdir" "${systemdutilconfdir}/portable"
+-[[ $hostonly ]] && set_global_var "systemd" "systemdportableconfdir" "${systemdutilconfdir}/portable"
-set_global_var "systemd" "systemdsystemunitdir" "${systemdutildir}/system"
--set_global_var "systemd" "systemdsystemconfdir" "${systemdutilconfdir}/system"
+-[[ $hostonly ]] && set_global_var "systemd" "systemdsystemconfdir" "${systemdutilconfdir}/system"
-set_global_var "systemd" "systemduser" "${systemdutildir}/user"
--set_global_var "systemd" "systemduserconfdir" "${systemdutilconfdir}/user"
+-[[ $hostonly ]] && set_global_var "systemd" "systemduserconfdir" "${systemdutilconfdir}/user"
-set_global_var "systemd" "sysusers" "/usr/lib/sysusers.d"
--set_global_var "systemd" "sysusersconfdir" "/etc/sysusers.d"
+-[[ $hostonly ]] && 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"
+-[[ $hostonly ]] && set_global_var "systemd" "tmpfilesconfdir" "/etc/tmpfiles.d"
+-set_global_var "systemd" "modversion:systemdversion" "0"
-
# libkmod global variables
set_global_var "libkmod" "depmodd" "/usr/lib/depmod.d"
- set_global_var "libkmod" "depmodconfdir" "/etc/depmod.d"
-@@ -1623,11 +1576,6 @@
- uefi_stub="$dracutsysrootdir${systemdprefix}/lib/systemd/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
- fi
+ [[ $hostonly ]] && set_global_var "libkmod" "depmodconfdir" "/etc/depmod.d"
+@@ -2207,13 +2155,6 @@
+ DRACUT_INSTALL_JSON=
+ $DRACUT_INSTALL --json-supported &> /dev/null && DRACUT_INSTALL_JSON=1
+
+-# systemd started declaring its dlopen dependencies in v256. Checking for these
+-# requires JSON support in dracut-install, provided by libsystemd v257. The
+-# version in the sysroot may be different to the one used by dracut-install.
+-USE_SYSTEMD_DLOPEN_DEPS=
+-# shellcheck disable=SC2034 # USE_SYSTEMD_DLOPEN_DEPS is used in modules
+-[[ $DRACUT_INSTALL_JSON && ${systemdversion%%.*} -ge 256 ]] && USE_SYSTEMD_DLOPEN_DEPS=1
+-
+ if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then
+ if ! [[ -f $srcmods/modules.dep ]]; then
+ if [[ -n "$(find "$srcmods" -name '*.ko*')" ]]; then
+@@ -2281,15 +2222,6 @@
+ ;;
+ esac
+- if ! [[ -s $uefi_stub ]]; then
+- uefi_stub="${dracutsysrootdir-}${systemdprefix}/lib/systemd/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
-
if ! [[ $kernel_image ]]; then
- for kernel_image in "$dracutsysrootdir/lib/modules/$kernel/vmlinuz" "$dracutsysrootdir/boot/vmlinuz-$kernel"; do
- [[ -s $kernel_image ]] || continue
-@@ -2120,18 +2068,6 @@
+ kernel_image=$(determine_kernel_image "$kernel")
+ fi
+@@ -2827,18 +2759,6 @@
cat "$f" >> "${initdir}/etc/fstab"
done
-- if [[ $dracutsysrootdir$systemdutildir ]]; then
+- if [[ ${dracutsysrootdir-}$systemdutildir ]]; then
- if [[ -d ${initdir}/$systemdutildir ]]; then
- mkdir -p "${initdir}"/etc/conf.d
- {
- fi
- fi
-
- if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then
- dinfo "*** Resolving executable dependencies ***"
+ if [[ ${DRACUT_RESOLVE_LAZY-} ]] && [[ $DRACUT_INSTALL ]]; then
+ dinfo "*** Resolving dependencies for executables and libraries ***"
# shellcheck disable=SC2086
-@@ -2722,25 +2658,4 @@
+@@ -3588,25 +3508,4 @@
esac
}
-# and there's no reason to sync, and *definitely* no reason to fsfreeze.
-# Another case where this happens is rpm-ostree, which performs its own sync/fsfreeze
-# globally. See e.g. https://github.com/ostreedev/ostree/commit/8642ef5ab3fec3ac8eb8f193054852f83a8bc4d0
--if [[ -d $dracutsysrootdir/run/systemd/system ]]; then
+-if [[ -d ${dracutsysrootdir-}/run/systemd/system ]]; then
- if ! sync "$outfile" 2> /dev/null; then
- dinfo "sync operation on newly created initramfs $outfile failed"
- exit 1
-fi
-
exit 0
-diff -ur dracut-ng-106.orig/modules.d/01fips/fips.sh dracut-ng-106/modules.d/01fips/fips.sh
---- dracut-ng-106.orig/modules.d/01fips/fips.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/01fips/fips.sh 2025-04-19 11:33:25.458453270 +0200
-@@ -4,15 +4,9 @@
-
- # systemd lets stdout go to journal only, but the system
- # has to halt when the integrity check fails to satisfy FIPS.
--if [ -z "$DRACUT_SYSTEMD" ]; then
+diff -ur dracut-111.orig/lsinitrd.sh dracut-111/lsinitrd.sh
+--- dracut-111.orig/lsinitrd.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/lsinitrd.sh 2026-05-19 20:11:50.507880805 +0200
+@@ -112,12 +112,7 @@
+ fi
+
+ if ! [[ $KERNEL_VERSION ]]; then
+- if type -P systemd-detect-virt &> /dev/null && ! systemd-detect-virt -c &> /dev/null && ! systemd-detect-virt -r &> /dev/null; then
+- KERNEL_VERSION="$(uname -r)"
+- else
+- # shellcheck disable=SC2012
+- KERNEL_VERSION="$(cd /lib/modules && ls -1v | tail -1)"
+- fi
++ KERNEL_VERSION="$(uname -r)"
+ fi
+
+ find_initrd_for_kernel_version() {
+diff -ur dracut-111.orig/modules.d/11fips/fips.sh dracut-111/modules.d/11fips/fips.sh
+--- dracut-111.orig/modules.d/11fips/fips.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/11fips/fips.sh 2026-05-19 19:10:57.500471542 +0200
+@@ -2,17 +2,9 @@
+
+ command -v getarg > /dev/null || . /lib/dracut-lib.sh
+
+-# systemd lets stdout go to journal only, but the system
+-# has to halt when the integrity check fails to satisfy FIPS.
+-if [ -z "${DRACUT_SYSTEMD-}" ]; then
- fips_info() {
- info "$*"
- }
# Checks if a systemd-based UKI is running and ESP UUID is set
is_uki() {
-diff -ur dracut-ng-106.orig/modules.d/02caps/module-setup.sh dracut-ng-106/modules.d/02caps/module-setup.sh
---- dracut-ng-106.orig/modules.d/02caps/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/02caps/module-setup.sh 2025-04-19 11:33:25.458453270 +0200
+diff -ur dracut-111.orig/modules.d/12caps/module-setup.sh dracut-111/modules.d/12caps/module-setup.sh
+--- dracut-111.orig/modules.d/12caps/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/12caps/module-setup.sh 2026-05-19 18:37:31.955785234 +0200
@@ -14,12 +14,8 @@
# called by dracut
+ # capsh wants bash and we need bash also
+ inst /bin/bash
}
-diff -ur dracut-ng-106.orig/modules.d/04watchdog/module-setup.sh dracut-ng-106/modules.d/04watchdog/module-setup.sh
---- dracut-ng-106.orig/modules.d/04watchdog/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/04watchdog/module-setup.sh 2025-04-19 11:33:25.458453270 +0200
-@@ -15,20 +15,17 @@
+diff -ur dracut-111.orig/modules.d/14watchdog/module-setup.sh dracut-111/modules.d/14watchdog/module-setup.sh
+--- dracut-111.orig/modules.d/14watchdog/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/14watchdog/module-setup.sh 2026-05-19 20:02:46.617571206 +0200
+@@ -8,31 +8,25 @@
+ # called by dracut
+ depends() {
+ echo watchdog-modules
+- if ! dracut_module_included "systemd"; then
+- echo initqueue
+- fi
++ echo initqueue
+ return 0
+ }
+
+ # called by dracut
install() {
- # Do not add watchdog hooks if systemd module is included
- # In that case, systemd will manage watchdog kick
+- # Do not add watchdog hooks if systemd module is included
+- # In that case, systemd will manage watchdog kick
- if ! dracut_module_included "systemd"; then
- inst_hook cmdline 00 "$moddir/watchdog.sh"
- inst_hook cmdline 50 "$moddir/watchdog.sh"
- inst_hook pre-pivot 99 "$moddir/watchdog.sh"
- inst_hook cleanup 00 "$moddir/watchdog.sh"
- inst_hook cleanup 99 "$moddir/watchdog.sh"
-- fi
--
+ inst_hook cmdline 00 "$moddir/watchdog.sh"
+ inst_hook cmdline 50 "$moddir/watchdog.sh"
+ inst_hook pre-trigger 00 "$moddir/watchdog.sh"
+ inst_hook pre-pivot 99 "$moddir/watchdog.sh"
+ inst_hook cleanup 00 "$moddir/watchdog.sh"
+ inst_hook cleanup 99 "$moddir/watchdog.sh"
+
+- inst_multiple -o wdctl
+- fi
++ inst_multiple -o wdctl
+
inst_hook emergency 02 "$moddir/watchdog-stop.sh"
- inst_multiple -o wdctl
}
-diff -ur dracut-ng-106.orig/modules.d/10i18n/console_init.sh dracut-ng-106/modules.d/10i18n/console_init.sh
---- dracut-ng-106.orig/modules.d/10i18n/console_init.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/10i18n/console_init.sh 2025-04-19 11:33:25.462453279 +0200
+diff -ur dracut-111.orig/modules.d/20i18n/console_init.sh dracut-111/modules.d/20i18n/console_init.sh
+--- dracut-111.orig/modules.d/20i18n/console_init.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/20i18n/console_init.sh 2026-05-19 19:08:20.555806683 +0200
@@ -1,11 +1,5 @@
#!/bin/sh
--[ -n "$DRACUT_SYSTEMD" ] && exit 0
+-[ -n "${DRACUT_SYSTEMD-}" ] && exit 0
-
-if [ -x "$systemdutildir"/systemd-vconsole-setup ]; then
- "$systemdutildir"/systemd-vconsole-setup "$@"
[ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
DEFAULT_FONT=eurlatgr
-diff -ur dracut-ng-106.orig/modules.d/10i18n/module-setup.sh dracut-ng-106/modules.d/10i18n/module-setup.sh
---- dracut-ng-106.orig/modules.d/10i18n/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/10i18n/module-setup.sh 2025-04-19 11:35:35.006747238 +0200
+diff -ur dracut-111.orig/modules.d/20i18n/module-setup.sh dracut-111/modules.d/20i18n/module-setup.sh
+--- dracut-111.orig/modules.d/20i18n/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/20i18n/module-setup.sh 2026-05-19 19:09:05.199995801 +0200
@@ -13,13 +13,6 @@
install() {
declare -A KEYMAPS
- unset FONT
- unset KEYMAP
- # shellcheck disable=SC1090
-- [[ -f "$dracutsysrootdir"/etc/vconsole.conf ]] && . "$dracutsysrootdir"/etc/vconsole.conf
+- [[ -f "${dracutsysrootdir-}"/etc/vconsole.conf ]] && . "${dracutsysrootdir-}"/etc/vconsole.conf
- fi
-
KBDSUBDIRS=(consolefonts consoletrans keymaps unimaps)
- if dracut_module_included "systemd"; then
- # https://github.com/dracutdevs/dracut/issues/796
-- [[ -f $dracutsysrootdir${VCONFIG_CONF} ]] && inst_simple ${VCONFIG_CONF}
+- [[ -f ${dracutsysrootdir-}${VCONFIG_CONF} ]] && inst_simple ${VCONFIG_CONF}
-
- inst_rules 90-vconsole.rules
-
-- if [[ -e "$systemdsystemunitdir"/systemd-vconsole-setup.service ]]; then
+- if [[ -e "${dracutsysrootdir-}$systemdsystemunitdir"/systemd-vconsole-setup.service ]]; then
- inst_multiple -o \
- "$systemdutildir"/systemd-vconsole-setup \
- "$systemdsystemunitdir"/systemd-vconsole-setup.service \
}
install_all_kbd() {
-@@ -182,12 +161,8 @@
+@@ -221,12 +200,8 @@
# shellcheck disable=SC1090
- [ -f "$dracutsysrootdir"$VCONFIG_CONF ] && . "$dracutsysrootdir"$VCONFIG_CONF
+ [ -f "${dracutsysrootdir-}"$VCONFIG_CONF ] && . "${dracutsysrootdir-}"$VCONFIG_CONF
-- if dracut_module_included "systemd" && [[ -f $dracutsysrootdir${I18N_CONF} ]]; then
+- if dracut_module_included "systemd" && [[ -f ${dracutsysrootdir-}${I18N_CONF} ]]; then
- inst_simple ${I18N_CONF}
- else
- mksubdirs "${initdir}"${I18N_CONF}
shopt -q -s nocasematch
if [[ ${UNICODE} ]]; then
-@@ -277,10 +252,8 @@
+@@ -313,10 +288,8 @@
inst_simple "${kbddir}"/unimaps/"${FONT_UNIMAP}".uni
fi
return 0
}
-diff -ur dracut-ng-106.orig/modules.d/35network-legacy/module-setup.sh dracut-ng-106/modules.d/35network-legacy/module-setup.sh
---- dracut-ng-106.orig/modules.d/35network-legacy/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/35network-legacy/module-setup.sh 2025-04-19 11:33:25.462453279 +0200
-@@ -24,14 +24,6 @@
- install() {
- local _arch
+diff -ur dracut-111.orig/modules.d/35network-legacy/module-setup.sh dracut-111/modules.d/35network-legacy/module-setup.sh
+--- dracut-111.orig/modules.d/35network-legacy/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/35network-legacy/module-setup.sh 2026-05-19 19:14:11.761294479 +0200
+@@ -16,14 +16,6 @@
+ # called by dracut
+ install() {
- # Adding default link and (if exists) 98-default-mac-none.link
- if dracut_module_included "systemd"; then
- inst_multiple -o \
inst_multiple ip dhclient sed awk grep pgrep tr expr
inst_multiple -o arping arping2
-diff -ur dracut-ng-106.orig/modules.d/35network-legacy/net-genrules.sh dracut-ng-106/modules.d/35network-legacy/net-genrules.sh
---- dracut-ng-106.orig/modules.d/35network-legacy/net-genrules.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/35network-legacy/net-genrules.sh 2025-04-19 11:33:25.462453279 +0200
+diff -ur dracut-111.orig/modules.d/35network-legacy/net-genrules.sh dracut-111/modules.d/35network-legacy/net-genrules.sh
+--- dracut-111.orig/modules.d/35network-legacy/net-genrules.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/35network-legacy/net-genrules.sh 2026-05-19 19:13:49.973202172 +0200
@@ -102,11 +102,8 @@
for iface in $IFACES; do
if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
-- if [ -n "$netroot" ] && [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "$netroot" ] && [ -n "${DRACUT_SYSTEMD-}" ]; then
- echo "systemctl is-active initrd-root-device.target || [ -f /tmp/net.${iface}.did-setup ]"
- else
- echo "[ -f /tmp/net.${iface}.did-setup ]"
- fi > "$hookdir"/initqueue/finished/wait-"$iface".sh
-+ echo "[ -f /tmp/net.${iface}.did-setup ]"
++ echo "[ -f /tmp/net.${iface}.did-setup ]" \
+ > "$hookdir"/initqueue/finished/wait-"$iface".sh
fi
done
# Default: We don't know the interface to use, handle all
-diff -ur dracut-ng-106.orig/modules.d/40network/module-setup.sh dracut-ng-106/modules.d/40network/module-setup.sh
---- dracut-ng-106.orig/modules.d/40network/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/40network/module-setup.sh 2025-04-19 11:36:27.858867421 +0200
-@@ -7,14 +7,14 @@
+diff -ur dracut-111.orig/modules.d/35network-manager/module-setup.sh dracut-111/modules.d/35network-manager/module-setup.sh
+--- dracut-111.orig/modules.d/35network-manager/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/35network-manager/module-setup.sh 2026-05-19 19:43:36.424714318 +0200
+@@ -11,9 +11,6 @@
+ # called by dracut
+ depends() {
+ echo bash net-lib kernel-network-modules initqueue
+- if dracut_module_included systemd; then
+- echo dbus
+- fi
+ return 0
+ }
+
+@@ -37,59 +34,6 @@
+ inst_multiple -o /usr/{lib,libexec}/nm-daemon-helper
+ inst_multiple -o teamd dhclient nft
+ inst_hook cmdline 99 "$moddir/nm-config.sh"
+- if dracut_module_included "systemd"; then
+-
+- inst "$dbussystem"/org.freedesktop.NetworkManager.conf
+- inst_multiple nmcli nm-online
+-
+- # teaming support under systemd+dbus
+- inst_multiple -o \
+- "$dbussystem"/teamd.conf
+-
+- if [[ $hostonly ]]; then
+- inst_multiple -H -o \
+- "$dbussystemconfdir"/teamd.conf
+- fi
+-
+- # Install a configuration snippet to prevent the automatic creation of
+- # "Wired connection #" DHCP connections for Ethernet interfaces
+- inst_simple "$moddir"/initrd-no-auto-default.conf /usr/lib/NetworkManager/conf.d/
+-
+- # Install systemd service units
+- if [[ -e "$systemdsystemunitdir"/NetworkManager-config-initrd.service ]]; then
+- # NetworkManager-1.54 provides its own initrd services
+- inst_multiple -o \
+- "$systemdsystemunitdir"/NetworkManager-config-initrd.service \
+- "$systemdsystemunitdir"/NetworkManager-initrd.service \
+- "$systemdsystemunitdir"/NetworkManager-wait-online-initrd.service
+-
+- # dracut specific dropins to override upstream systemd services
+- inst_simple "$moddir/NetworkManager-config-initrd-dracut.conf" \
+- "$systemdsystemunitdir/NetworkManager-config-initrd.service.d/NetworkManager-config-initrd-dracut.conf"
+- inst_simple "$moddir/NetworkManager-wait-online-initrd-dracut.conf" \
+- "$systemdsystemunitdir/NetworkManager-wait-online-initrd.service.d/NetworkManager-wait-online-initrd-dracut.conf"
+-
+- # NetworkManager-1.56 provides a systemd generator to install initrd
+- # services, so they no longer have an "[Install]" section.
+- if [[ -e "$systemdutildir"/system-generators/nm-initrd-generator.sh ]]; then
+- inst "$systemdutildir"/system-generators/nm-initrd-generator.sh
+- else
+- $SYSTEMCTL -q --root "$initdir" enable NetworkManager-initrd.service
+- fi
+- else
+- #TODO: remove custom systemd services when NetworkManager-1.56 is the minimum supported version
+- inst_simple "$moddir"/nm-initrd.service "$systemdsystemunitdir"/nm-initrd.service
+- inst_simple "$moddir"/nm-wait-online-initrd.service "$systemdsystemunitdir"/nm-wait-online-initrd.service
+-
+- $SYSTEMCTL -q --root "$initdir" enable nm-initrd.service
+- fi
+-
+- # Adding default link and (if exists) 98-default-mac-none.link
+- inst_multiple -o \
+- "${systemdnetwork}/99-default.link" \
+- "${systemdnetwork}/98-default-mac-none.link"
+- [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link"
+- fi
+
+ inst_hook initqueue/settled 99 "$moddir/nm-run.sh"
+
+diff -ur dracut-111.orig/modules.d/35network-manager/nm-config.sh dracut-111/modules.d/35network-manager/nm-config.sh
+--- dracut-111.orig/modules.d/35network-manager/nm-config.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/35network-manager/nm-config.sh 2026-05-19 19:59:07.540641222 +0200
+@@ -2,9 +2,7 @@
+
+ command -v getargbool > /dev/null || . /lib/dracut-lib.sh
+
+-[ -e /usr/lib/systemd/system/NetworkManager-initrd.service ] \
+- && nm_service_name="NetworkManager-initrd" \
+- || nm_service_name="nm-initrd"
++nm_service_name="nm-initrd"
+
+ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
+ echo rd.neednet >> /etc/cmdline.d/20-neednet.conf
+@@ -21,19 +19,6 @@
+ echo 'level=TRACE'
+ ) > /run/NetworkManager/conf.d/initrd-logging.conf
+
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
+- # Enable tty output if a usable console is found
+- # See https://github.com/coreos/fedora-coreos-tracker/issues/943
+- # shellcheck disable=SC2217
+- if [ -w /dev/console ] && (echo < /dev/console) > /dev/null 2> /dev/null; then
+- mkdir -p /run/systemd/system/"$nm_service_name".service.d
+- cat << EOF > /run/systemd/system/"$nm_service_name".service.d/tty-output.conf
+-[Service]
+-StandardOutput=tty
+-EOF
+- systemctl --no-block daemon-reload
+- fi
+- fi
+ fi
+
+ if [ "$nm_service_name" = "nm-initrd" ]; then
+diff -ur dracut-111.orig/modules.d/35network-manager/nm-lib.sh dracut-111/modules.d/35network-manager/nm-lib.sh
+--- dracut-111.orig/modules.d/35network-manager/nm-lib.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/35network-manager/nm-lib.sh 2026-05-19 20:01:02.033127047 +0200
+@@ -3,36 +3,30 @@
+ command -v getcmdline > /dev/null || . /lib/dracut-lib.sh
+
+ nm_generate_connections() {
+- if [ -e /usr/lib/systemd/system/NetworkManager-config-initrd.service ]; then
+- systemctl restart NetworkManager-config-initrd.service
++ rm -f /run/NetworkManager/system-connections/*
++ if [ -x /usr/libexec/nm-initrd-generator ]; then
++ # shellcheck disable=SC2046
++ /usr/libexec/nm-initrd-generator -- $(getcmdline)
++ elif [ -x /usr/lib/nm-initrd-generator ]; then
++ # shellcheck disable=SC2046
++ /usr/lib/nm-initrd-generator -- $(getcmdline)
+ else
+- rm -f /run/NetworkManager/system-connections/*
+- if [ -x /usr/libexec/nm-initrd-generator ]; then
+- # shellcheck disable=SC2046
+- /usr/libexec/nm-initrd-generator -- $(getcmdline)
+- elif [ -x /usr/lib/nm-initrd-generator ]; then
+- # shellcheck disable=SC2046
+- /usr/lib/nm-initrd-generator -- $(getcmdline)
+- else
+- warn "nm-initrd-generator not found"
+- fi
++ warn "nm-initrd-generator not found"
++ fi
+
+- if getargbool 0 rd.neednet; then
+- for i in /usr/lib/NetworkManager/system-connections/* \
+- /run/NetworkManager/system-connections/* \
+- /etc/NetworkManager/system-connections/*; do
+- [ -f "$i" ] || continue
+- echo '[ -f /tmp/nm.done ]' > "$hookdir"/initqueue/finished/nm.sh
+- mkdir -p /run/NetworkManager/initrd
+- : > /run/NetworkManager/initrd/neednet # activate NM services
+- break
+- done
+- fi
++ if getargbool 0 rd.neednet; then
++ for i in /usr/lib/NetworkManager/system-connections/* \
++ /run/NetworkManager/system-connections/* \
++ /etc/NetworkManager/system-connections/*; do
++ [ -f "$i" ] || continue
++ echo '[ -f /tmp/nm.done ]' > "$hookdir"/initqueue/finished/nm.sh
++ mkdir -p /run/NetworkManager/initrd
++ : > /run/NetworkManager/initrd/neednet # activate NM services
++ break
++ done
+ fi
+ }
+
+ nm_reload_connections() {
+- [ -n "${DRACUT_SYSTEMD-}" ] \
+- && systemctl -q is-active nm-initrd.service NetworkManager-initrd.service \
+- && nmcli connection reload
++ nmcli connection reload
+ }
+diff -ur dracut-111.orig/modules.d/35network-manager/nm-run.sh dracut-111/modules.d/35network-manager/nm-run.sh
+--- dracut-111.orig/modules.d/35network-manager/nm-run.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/35network-manager/nm-run.sh 2026-05-19 20:01:31.089250447 +0200
+@@ -2,22 +2,15 @@
+
+ command -v source_hook > /dev/null || . /lib/dracut-lib.sh
+
+-if [ -z "${DRACUT_SYSTEMD-}" ]; then
+- # Only start NM if networking is needed
+- if [ -e /run/NetworkManager/initrd/neednet ]; then
+- for i in /usr/lib/NetworkManager/system-connections/* \
+- /run/NetworkManager/system-connections/* \
+- /etc/NetworkManager/system-connections/*; do
+- [ -f "$i" ] || continue
+- /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
+- break
+- done
+- fi
+-fi
+-
+-if [ -e /usr/lib/systemd/system/nm-initrd.service ] \
+- && [ -s /run/NetworkManager/initrd/hostname ]; then
+- cat /run/NetworkManager/initrd/hostname > /proc/sys/kernel/hostname
++# Only start NM if networking is needed
++if [ -e /run/NetworkManager/initrd/neednet ]; then
++ for i in /usr/lib/NetworkManager/system-connections/* \
++ /run/NetworkManager/system-connections/* \
++ /etc/NetworkManager/system-connections/*; do
++ [ -f "$i" ] || continue
++ /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
++ break
++ done
+ fi
+
+ kf_get_string() {
+diff -ur dracut-111.orig/modules.d/40network/module-setup.sh dracut-111/modules.d/40network/module-setup.sh
+--- dracut-111.orig/modules.d/40network/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/40network/module-setup.sh 2026-05-19 18:37:36.559805420 +0200
+@@ -9,14 +9,14 @@
# called by dracut
depends() {
+ 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-106.orig/modules.d/45net-lib/net-lib.sh dracut-ng-106/modules.d/45net-lib/net-lib.sh
---- dracut-ng-106.orig/modules.d/45net-lib/net-lib.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/45net-lib/net-lib.sh 2025-04-19 11:33:25.462453279 +0200
+ if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $module\ * ]]; then
+diff -ur dracut-111.orig/modules.d/45net-lib/net-lib.sh dracut-111/modules.d/45net-lib/net-lib.sh
+--- dracut-111.orig/modules.d/45net-lib/net-lib.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/45net-lib/net-lib.sh 2026-05-19 18:37:36.559805420 +0200
@@ -59,7 +59,7 @@
configured_ifaces() {
local IFACES="" iface_id="" rv=1
for iface_id in $IFACES; do
printf "%s\n" "$(iface_name "$iface_id")"
rv=0
-diff -ur dracut-ng-106.orig/modules.d/90btrfs/module-setup.sh dracut-ng-106/modules.d/90btrfs/module-setup.sh
---- dracut-ng-106.orig/modules.d/90btrfs/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90btrfs/module-setup.sh 2025-04-19 11:33:25.462453279 +0200
-@@ -51,9 +51,7 @@
+diff -ur dracut-111.orig/modules.d/70btrfs/module-setup.sh dracut-111/modules.d/70btrfs/module-setup.sh
+--- dracut-111.orig/modules.d/70btrfs/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70btrfs/module-setup.sh 2026-05-19 18:37:36.559805420 +0200
+@@ -50,9 +50,7 @@
inst_rules 64-btrfs-dm.rules
fi
- fi
+ inst_hook initqueue/timeout 10 "$moddir/btrfs_timeout.sh"
- inst_multiple -o btrfsck btrfs-zero-log
- inst "$(command -v btrfs)" /sbin/btrfs
-diff -ur dracut-ng-106.orig/modules.d/90crypt/crypt-lib.sh dracut-ng-106/modules.d/90crypt/crypt-lib.sh
---- dracut-ng-106.orig/modules.d/90crypt/crypt-lib.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90crypt/crypt-lib.sh 2025-04-19 11:33:25.462453279 +0200
-@@ -105,30 +105,22 @@
-
- {
- flock -s 9
-- # Prompt for password with plymouth, if installed and running.
-- if type plymouth > /dev/null 2>&1 && plymouth --ping 2> /dev/null; then
-- plymouth ask-for-password \
-- --prompt "$ply_prompt" --number-of-tries="$ply_tries" \
-- --command="$ply_cmd"
-- ret=$?
-- else
-- if [ "$tty_echo_off" = yes ]; then
-- stty_orig="$(stty -g)"
-- stty -echo
-- fi
-+ if [ "$tty_echo_off" = yes ]; then
-+ stty_orig="$(stty -g)"
-+ stty -echo
-+ fi
-
-- local i=1
-- while [ $i -le "$tty_tries" ]; do
-- [ -n "$tty_prompt" ] \
-- && printf "%s" "$tty_prompt [$i/$tty_tries]:" >&2
-- eval "$tty_cmd" && ret=0 && break
-- ret=$?
-- i=$((i + 1))
-- [ -n "$tty_prompt" ] && printf '\n' >&2
-- done
-+ local i=1
-+ while [ $i -le "$tty_tries" ]; do
-+ [ -n "$tty_prompt" ] \
-+ && printf "%s" "$tty_prompt [$i/$tty_tries]:" >&2
-+ eval "$tty_cmd" && ret=0 && break
-+ ret=$?
-+ i=$((i + 1))
-+ [ -n "$tty_prompt" ] && printf '\n' >&2
-+ done
-
-- [ "$tty_echo_off" = yes ] && stty "$stty_orig"
-- fi
-+ [ "$tty_echo_off" = yes ] && stty "$stty_orig"
- } 9> /.console_lock
-
- [ $ret -ne 0 ] && echo "Wrong password" >&2
-diff -ur dracut-ng-106.orig/modules.d/90crypt/crypt-run-generator.sh dracut-ng-106/modules.d/90crypt/crypt-run-generator.sh
---- dracut-ng-106.orig/modules.d/90crypt/crypt-run-generator.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90crypt/crypt-run-generator.sh 2025-04-19 11:33:25.462453279 +0200
+ inst_multiple -o btrfsck btrfs-zero-log btrfstune
+ inst btrfs /sbin/btrfs
+diff -ur dracut-111.orig/modules.d/70crypt/crypt-run-generator.sh dracut-111/modules.d/70crypt/crypt-run-generator.sh
+--- dracut-111.orig/modules.d/70crypt/crypt-run-generator.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70crypt/crypt-run-generator.sh 2026-05-19 19:04:58.238937907 +0200
@@ -11,7 +11,7 @@
allowdiscards="-"
# parse for allow-discards
--if [ -n "$DRACUT_SYSTEMD" ] || strstr "$(cryptsetup --help)" "allow-discards"; then
+-if [ -n "${DRACUT_SYSTEMD-}" ] || strstr "$(cryptsetup --help)" "allow-discards"; then
+if strstr "$(cryptsetup --help)" "allow-discards"; then
if discarduuids=$(getargs "rd.luks.allow-discards"); then
discarduuids=$(str_replace "$discarduuids" 'luks-' '')
- systemctl start cryptsetup.target
-fi
exit 0
-diff -ur dracut-ng-106.orig/modules.d/90crypt/module-setup.sh dracut-ng-106/modules.d/90crypt/module-setup.sh
---- dracut-ng-106.orig/modules.d/90crypt/module-setup.sh 2025-04-19 11:29:37.321935659 +0200
-+++ dracut-ng-106/modules.d/90crypt/module-setup.sh 2025-04-19 11:33:25.462453279 +0200
+diff -ur dracut-111.orig/modules.d/70crypt/module-setup.sh dracut-111/modules.d/70crypt/module-setup.sh
+--- dracut-111.orig/modules.d/70crypt/module-setup.sh 2026-05-19 18:28:56.117376072 +0200
++++ dracut-111/modules.d/70crypt/module-setup.sh 2026-05-19 19:05:24.135049509 +0200
@@ -4,7 +4,7 @@
check() {
local fs
[[ $hostonly ]] || [[ $mount_needs ]] && {
for fs in "${host_fs_types[@]}"; do
-@@ -79,13 +79,11 @@
+@@ -84,15 +84,11 @@
fi
inst_hook cmdline 30 "$moddir/parse-crypt.sh"
-- if ! dracut_module_included "systemd"; then
+- if dracut_module_included "systemd"; then
+- inst_script "$moddir/crypt-generator.sh" "$systemdutildir"/system-generators/dracut-crypt-generator
+- else
- inst_multiple cryptsetup rmdir readlink umount
- inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
- inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev
+ inst_hook cmdline 10 "$moddir/parse-keydev.sh"
+ inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
- if [[ $hostonly ]] && [[ -f $dracutsysrootdir/etc/crypttab ]]; then
+ if [[ $hostonly ]] && [[ -f "${dracutsysrootdir-}/etc/crypttab" ]]; then
# filter /etc/crypttab for the devices we need
-diff -ur dracut-ng-106.orig/modules.d/90crypt/parse-crypt.sh dracut-ng-106/modules.d/90crypt/parse-crypt.sh
---- dracut-ng-106.orig/modules.d/90crypt/parse-crypt.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90crypt/parse-crypt.sh 2025-04-19 11:33:25.462453279 +0200
-@@ -36,12 +36,6 @@
- LUKS=$(getargs rd.luks.uuid)
- tout=$(getarg rd.luks.key.tout)
-
-- if [ -e /etc/crypttab ]; then
-- while read -r _ _dev _ || [ -n "$_dev" ]; do
-- set_systemd_timeout_for_dev "$_dev"
-- done < /etc/crypttab
-- fi
--
- if [ -n "$PARTUUID" ]; then
- for uuid in $PARTUUID; do
-
-@@ -58,28 +52,13 @@
+diff -ur dracut-111.orig/modules.d/70crypt/parse-crypt.sh dracut-111/modules.d/70crypt/parse-crypt.sh
+--- dracut-111.orig/modules.d/70crypt/parse-crypt.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70crypt/parse-crypt.sh 2026-05-19 19:07:21.963557301 +0200
+@@ -52,28 +52,14 @@
luksname="luks-$uuid"
fi
-- if [ -z "$DRACUT_SYSTEMD" ]; then
+- if [ -z "${DRACUT_SYSTEMD-}" ]; then
- {
- printf -- 'ENV{ID_PART_ENTRY_UUID}=="*%s*", ' "$uuid"
- printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
+ # shellcheck disable=SC2016
+ printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
+ } >> /etc/udev/rules.d/70-luks.rules.new
++
done
elif [ -n "$SERIAL" ]; then
-@@ -98,28 +77,13 @@
+@@ -92,28 +78,14 @@
luksname="luks-$serialid"
fi
-- if [ -z "$DRACUT_SYSTEMD" ]; then
+- if [ -z "${DRACUT_SYSTEMD-}" ]; then
- {
- printf -- 'ENV{ID_SERIAL_SHORT}=="*%s*", ' "$serialid"
- printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
+ # shellcheck disable=SC2016
+ printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
+ } >> /etc/udev/rules.d/70-luks.rules.new
++
done
elif [ -n "$LUKS" ]; then
-@@ -138,30 +102,14 @@
+@@ -132,30 +104,14 @@
luksname="luks-$luksid"
fi
-- if [ -z "$DRACUT_SYSTEMD" ]; then
+- if [ -z "${DRACUT_SYSTEMD-}" ]; then
- {
- printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
- printf -- 'ENV{ID_FS_UUID}=="*%s*", ' "$luksid"
if [ $is_keysource -eq 0 ]; then
uuid=$luksid
-@@ -175,21 +123,12 @@
+@@ -169,21 +125,12 @@
fi
done
elif getargbool 0 rd.auto; then
-- if [ -z "$DRACUT_SYSTEMD" ]; then
+- if [ -z "${DRACUT_SYSTEMD-}" ]; then
- {
- printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
- printf -- '--unique --settled --onetime --name cryptroot-ask-%%k '
- fi
+ {
+ printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
-+ printf -- '--unique --settled --onetime --name crypt-run-generator-%%k '
++ printf -- '--unique --settled --onetime --name cryptroot-ask-%%k '
+ # shellcheck disable=SC2016
-+ printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID}"\n' "$(command -v crypt-run-generator)"
++ printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} 0 %s"\n' "$(command -v cryptroot-ask)" "$tout"
+ } >> /etc/udev/rules.d/70-luks.rules.new
fi
echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new
-diff -ur dracut-ng-106.orig/modules.d/90dm/dm-shutdown.sh dracut-ng-106/modules.d/90dm/dm-shutdown.sh
---- dracut-ng-106.orig/modules.d/90dm/dm-shutdown.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90dm/dm-shutdown.sh 2025-04-19 11:33:25.462453279 +0200
+diff -ur dracut-111.orig/modules.d/70dm/dm-shutdown.sh dracut-111/modules.d/70dm/dm-shutdown.sh
+--- dracut-111.orig/modules.d/70dm/dm-shutdown.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70dm/dm-shutdown.sh 2026-05-19 18:37:38.567814220 +0200
@@ -20,9 +20,7 @@
return 0
;;
DM_DISABLE_UDEV=true cryptsetup close --debug "$devname" && return 0
else
dmsetup -v --noudevsync remove "$devname"
-diff -ur dracut-ng-106.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-ng-106/modules.d/90dmsquash-live/dmsquash-live-root.sh
---- dracut-ng-106.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90dmsquash-live/dmsquash-live-root.sh 2025-04-19 11:33:25.462453279 +0200
-@@ -72,20 +72,13 @@
- fi
+diff -ur dracut-111.orig/modules.d/70dmsquash-live/dmsquash-live-root.sh dracut-111/modules.d/70dmsquash-live/dmsquash-live-root.sh
+--- dracut-111.orig/modules.d/70dmsquash-live/dmsquash-live-root.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70dmsquash-live/dmsquash-live-root.sh 2026-05-19 19:29:26.397155047 +0200
+@@ -74,12 +74,7 @@
getarg rd.live.check || check=""
if [ -n "$check" ]; then
-- type plymouth > /dev/null 2>&1 && plymouth --hide-splash
-- if [ -n "$DRACUT_SYSTEMD" ]; 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
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
-
-@@ -178,7 +171,6 @@
+@@ -183,7 +178,6 @@
fi
if [ -n "$overlayfs" ]; then
unset -v overlayfs
-- [ -n "$DRACUT_SYSTEMD" ] && reloadsysrootmountunit=":>/xor_overlayfs;"
+- [ -n "${DRACUT_SYSTEMD-}" ] && reloadsysrootmountunit=":>/xor_overlayfs;"
fi
setup="yes"
else
-@@ -187,9 +179,6 @@
+@@ -192,9 +186,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}
-- if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -z "$overlayfs" ] && [ -n "${DRACUT_SYSTEMD-}" ]; then
- reloadsysrootmountunit=":>/xor_overlayfs;"
- fi
overlayfs="required"
setup="yes"
fi
-@@ -198,9 +187,6 @@
+@@ -203,9 +194,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
+- if [ -z "$overlayfs" ] && [ -n "${DRACUT_SYSTEMD-}" ]; then
- reloadsysrootmountunit=":>/xor_overlayfs;"
- fi
overlayfs="required"
setup="yes"
fi
-@@ -211,7 +197,6 @@
+@@ -216,7 +204,6 @@
die "OverlayFS is required but not available."
exit 1
fi
-- [ -n "$DRACUT_SYSTEMD" ] && reloadsysrootmountunit=":>/xor_overlayfs;"
+- [ -n "${DRACUT_SYSTEMD-}" ] && reloadsysrootmountunit=":>/xor_overlayfs;"
m='OverlayFS is not available; using temporary Device-mapper overlay.'
info "$m"
unset -v overlayfs setup
-@@ -228,40 +213,13 @@
+@@ -233,40 +220,14 @@
All root filesystem changes will be lost on shutdown.
Press [Enter] to continue.'
printf "\n\n\n\n%s\n\n\n" "${m}" > /dev/kmsg
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- if type plymouth > /dev/null 2>&1 && plymouth --ping; then
- if getargbool 0 rhgb || getargbool 0 splash; then
- m='>>>
- printf '\n\n%s' "$m"
- read -r _
- fi
++ type plymouth > /dev/null 2>&1 && plymouth --ping && plymouth --quit
+ printf '\n\n%s' "$m"
+ read -r _
fi
if [ -n "$readonly_overlay" ] && ! [ -h /run/overlayfs-r ]; then
info "No persistent overlay found."
unset -v readonly_overlay
-- [ -n "$DRACUT_SYSTEMD" ] && reloadsysrootmountunit="${reloadsysrootmountunit}:>/xor_readonly;"
+- [ -n "${DRACUT_SYSTEMD-}" ] && reloadsysrootmountunit="${reloadsysrootmountunit}:>/xor_readonly;"
fi
else
dd if=/dev/null of=/overlay bs=1024 count=1 seek=$((overlay_size * 1024)) 2> /dev/null
-@@ -346,9 +304,6 @@
+@@ -351,9 +312,6 @@
fi
- elif [ -d /run/initramfs/squashfs/usr ]; then
+ elif [ -d /run/initramfs/squashfs/usr ] || [ -d /run/initramfs/squashfs/ostree ]; then
FSIMG=$SQUASHED
-- if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -z "$overlayfs" ] && [ -n "${DRACUT_SYSTEMD-}" ]; then
- reloadsysrootmountunit=":>/xor_overlayfs;"
- fi
overlayfs="required"
else
die "Failed to find a root filesystem in $SQUASHED."
-@@ -427,10 +382,8 @@
+@@ -436,10 +394,8 @@
ln -sf /run/initramfs/live /run/rootfsbase
fi
else
-- if [ -z "$DRACUT_SYSTEMD" ]; then
+- if [ -z "${DRACUT_SYSTEMD-}" ]; then
- [ -n "$ROOTFLAGS" ] && ROOTFLAGS="-o $ROOTFLAGS"
- printf 'mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > "$hookdir"/mount/01-$$-live.sh
- fi
fi
[ -e "$SQUASHED" ] && umount -l /run/initramfs/squashfs
-diff -ur dracut-ng-106.orig/modules.d/90dmsquash-live/module-setup.sh dracut-ng-106/modules.d/90dmsquash-live/module-setup.sh
---- dracut-ng-106.orig/modules.d/90dmsquash-live/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90dmsquash-live/module-setup.sh 2025-04-19 11:33:25.462453279 +0200
-@@ -31,9 +31,5 @@
+diff -ur dracut-111.orig/modules.d/70dmsquash-live/module-setup.sh dracut-111/modules.d/70dmsquash-live/module-setup.sh
+--- dracut-111.orig/modules.d/70dmsquash-live/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70dmsquash-live/module-setup.sh 2026-05-19 19:29:37.565201769 +0200
+@@ -31,8 +31,4 @@
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"
-- if dracut_module_included "systemd-initrd"; then
+- if dracut_module_included "systemd"; then
- inst_script "$moddir/dmsquash-generator.sh" "$systemdutildir"/system-generators/dracut-dmsquash-generator
- inst_simple "$moddir/checkisomd5@.service" "/etc/systemd/system/checkisomd5@.service"
- fi
- dracut_need_initqueue
}
-diff -ur dracut-ng-106.orig/modules.d/90kernel-modules/module-setup.sh dracut-ng-106/modules.d/90kernel-modules/module-setup.sh
---- dracut-ng-106.orig/modules.d/90kernel-modules/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90kernel-modules/module-setup.sh 2025-04-19 11:33:25.466453288 +0200
-@@ -150,9 +150,7 @@
- [[ -d /lib/modprobe.d ]] && inst_multiple -o "/lib/modprobe.d/*.conf"
- [[ -d /usr/lib/modprobe.d ]] && inst_multiple -o "/usr/lib/modprobe.d/*.conf"
- [[ $hostonly ]] && inst_multiple -H -o /etc/modprobe.d/*.conf /etc/modprobe.conf
-- if ! dracut_module_included "systemd"; then
-- inst_hook cmdline 01 "$moddir/parse-kernel.sh"
-- fi
-+ inst_hook cmdline 01 "$moddir/parse-kernel.sh"
- inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
- inst_multiple -o sysctl
- }
-diff -ur dracut-ng-106.orig/modules.d/90livenet/module-setup.sh dracut-ng-106/modules.d/90livenet/module-setup.sh
---- dracut-ng-106.orig/modules.d/90livenet/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90livenet/module-setup.sh 2025-04-19 11:33:25.466453288 +0200
-@@ -17,8 +17,5 @@
+diff -ur dracut-111.orig/modules.d/70livenet/module-setup.sh dracut-111/modules.d/70livenet/module-setup.sh
+--- dracut-111.orig/modules.d/70livenet/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70livenet/module-setup.sh 2026-05-19 19:16:44.333940841 +0200
+@@ -17,7 +17,4 @@
inst_hook cmdline 29 "$moddir/parse-livenet.sh"
inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh"
inst_script "$moddir/livenetroot.sh" "/sbin/livenetroot"
-- if dracut_module_included "systemd-initrd"; then
+- if dracut_module_included "systemd"; then
- inst_script "$moddir/livenet-generator.sh" "$systemdutildir"/system-generators/dracut-livenet-generator
- fi
- dracut_need_initqueue
}
-diff -ur dracut-ng-106.orig/modules.d/90mdraid/module-setup.sh dracut-ng-106/modules.d/90mdraid/module-setup.sh
---- dracut-ng-106.orig/modules.d/90mdraid/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90mdraid/module-setup.sh 2025-04-19 11:33:25.466453288 +0200
-@@ -114,20 +114,6 @@
+diff -ur dracut-111.orig/modules.d/70mdraid/module-setup.sh dracut-111/modules.d/70mdraid/module-setup.sh
+--- dracut-111.orig/modules.d/70mdraid/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70mdraid/module-setup.sh 2026-05-19 19:07:49.211673908 +0200
+@@ -114,19 +114,5 @@
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
- if dracut_module_included "systemd"; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/mdmon@.service ]]; then
+- if [[ -e "${dracutsysrootdir-}$systemdsystemunitdir/mdmon@.service" ]]; then
- inst_simple "$systemdsystemunitdir"/mdmon@.service
- fi
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/mdadm-last-resort@.service ]]; then
+- if [[ -e "${dracutsysrootdir-}$systemdsystemunitdir/mdadm-last-resort@.service" ]]; then
- inst_simple "$systemdsystemunitdir"/mdadm-last-resort@.service
- fi
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/mdadm-last-resort@.timer ]]; then
+- if [[ -e "${dracutsysrootdir-}$systemdsystemunitdir/mdadm-last-resort@.timer" ]]; then
- inst_simple "$systemdsystemunitdir"/mdadm-last-resort@.timer
- fi
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/mdadm-grow-continue@.service ]]; then
+- if [[ -e "${dracutsysrootdir-}$systemdsystemunitdir/mdadm-grow-continue@.service" ]]; then
- inst_simple "$systemdsystemunitdir"/mdadm-grow-continue@.service
- fi
- fi
inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
- dracut_need_initqueue
}
-diff -ur dracut-ng-106.orig/modules.d/90multipath/module-setup.sh dracut-ng-106/modules.d/90multipath/module-setup.sh
---- dracut-ng-106.orig/modules.d/90multipath/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/90multipath/module-setup.sh 2025-04-19 11:33:25.466453288 +0200
-@@ -146,17 +146,8 @@
- [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/90multipath.conf"
+diff -ur dracut-111.orig/modules.d/70multipath/module-setup.sh dracut-111/modules.d/70multipath/module-setup.sh
+--- dracut-111.orig/modules.d/70multipath/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70multipath/module-setup.sh 2026-05-19 19:34:10.702344489 +0200
+@@ -88,7 +88,6 @@
+ [[ -d $config_dir ]] || config_dir=/etc/multipath/conf.d
+
+ inst_multiple \
+- "$systemdsystemunitdir"/multipathd.service \
+ pkill \
+ kpartx \
+ dmsetup \
+@@ -144,17 +143,8 @@
+ [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/20-multipath.conf"
fi
- if dracut_module_included "systemd"; then
- inst_simple "${moddir}/multipathd-configure.service" "${systemdsystemunitdir}/multipathd-configure.service"
- $SYSTEMCTL -q --root "$initdir" enable multipathd-configure.service
- fi
-- inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service"
+- inst_simple "$moddir/multipathd-dracut.conf" "$systemdsystemunitdir/multipathd.service.d/multipathd-dracut.conf"
- $SYSTEMCTL -q --root "$initdir" enable multipathd.service
- else
- inst_hook pre-trigger 02 "$moddir/multipathd.sh"
inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
inst_hook shutdown 20 "$moddir/multipath-shutdown.sh"
-diff -ur dracut-ng-106.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-ng-106/modules.d/91zipl/install_zipl_cmdline.sh
---- dracut-ng-106.orig/modules.d/91zipl/install_zipl_cmdline.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/91zipl/install_zipl_cmdline.sh 2025-04-19 11:33:25.466453288 +0200
-@@ -30,10 +30,6 @@
-
- umount ${MNT}
+diff -ur dracut-111.orig/modules.d/70qemu/module-setup.sh dracut-111/modules.d/70qemu/module-setup.sh
+--- dracut-111.orig/modules.d/70qemu/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/70qemu/module-setup.sh 2026-05-19 20:04:15.313947888 +0200
+@@ -7,15 +7,6 @@
+ # do not consult /sys and do not detect virt environment in non-hostonly mode
+ ! [[ ${hostonly-} ]] && return 1
--if [ -f /etc/cmdline.d/99zipl.conf ]; then
-- systemctl restart dracut-cmdline.service
-- systemctl restart systemd-udev-trigger.service
--fi
- : > /tmp/install.zipl.cmdline-done
-
- exit 0
-diff -ur dracut-ng-106.orig/modules.d/95debug/module-setup.sh dracut-ng-106/modules.d/95debug/module-setup.sh
---- dracut-ng-106.orig/modules.d/95debug/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95debug/module-setup.sh 2025-04-19 11:33:25.466453288 +0200
+- if type -P systemd-detect-virt > /dev/null 2>&1; then
+- if ! vm=$(systemd-detect-virt --vm 2> /dev/null); then
+- return 1
+- 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
+ read -r vendor < "$i"
+diff -ur dracut-111.orig/modules.d/74debug/module-setup.sh dracut-111/modules.d/74debug/module-setup.sh
+--- dracut-111.orig/modules.d/74debug/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74debug/module-setup.sh 2026-05-19 18:37:39.303817448 +0200
@@ -43,7 +43,6 @@
showmount \
ssh \
tcpdump \
vi
-diff -ur dracut-ng-106.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-ng-106/modules.d/95fcoe/cleanup-fcoe.sh
---- dracut-ng-106.orig/modules.d/95fcoe/cleanup-fcoe.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95fcoe/cleanup-fcoe.sh 2025-04-19 11:33:25.466453288 +0200
-@@ -6,10 +6,8 @@
+diff -ur dracut-111.orig/modules.d/74fcoe/cleanup-fcoe.sh dracut-111/modules.d/74fcoe/cleanup-fcoe.sh
+--- dracut-111.orig/modules.d/74fcoe/cleanup-fcoe.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74fcoe/cleanup-fcoe.sh 2026-05-19 19:14:52.441466817 +0200
+@@ -4,12 +4,8 @@
+
+ if [ -e /var/run/lldpad.pid ]; then
lldpad -k
- # with systemd version 230, this is not necessary anymore
- # systemd commit cacf980ed44a28e276a6cc7f8fc41f991e2ab354
-- if [ -z "$DRACUT_SYSTEMD" ]; then
+- # with systemd version 230, this is not necessary anymore
+- # systemd commit cacf980ed44a28e276a6cc7f8fc41f991e2ab354
+- if [ -z "${DRACUT_SYSTEMD-}" ]; then
- # shellcheck disable=SC2174
- mkdir -m 0755 -p /run/initramfs/state/dev/shm
- cp /dev/shm/lldpad.state /run/initramfs/state/dev/shm/ > /dev/null 2>&1
+ cp /dev/shm/lldpad.state /run/initramfs/state/dev/shm/ > /dev/null 2>&1
+ echo "files /dev/shm/lldpad.state" >> /run/initramfs/rwtab
fi
-diff -ur dracut-ng-106.orig/modules.d/95fstab-sys/mount-sys.sh dracut-ng-106/modules.d/95fstab-sys/mount-sys.sh
---- dracut-ng-106.orig/modules.d/95fstab-sys/mount-sys.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95fstab-sys/mount-sys.sh 2025-04-19 11:33:25.466453288 +0200
-@@ -27,9 +27,7 @@
-
- # systemd will mount and run fsck from /etc/fstab and we don't want to
- # run into a race condition.
--if [ -z "$DRACUT_SYSTEMD" ]; then
+diff -ur dracut-111.orig/modules.d/74fstab-sys/mount-sys.sh dracut-111/modules.d/74fstab-sys/mount-sys.sh
+--- dracut-111.orig/modules.d/74fstab-sys/mount-sys.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74fstab-sys/mount-sys.sh 2026-05-19 19:10:08.260262949 +0200
+@@ -25,11 +25,7 @@
+ return 0
+ }
+
+-# systemd will mount and run fsck from /etc/fstab and we don't want to
+-# run into a race condition.
+-if [ -z "${DRACUT_SYSTEMD-}" ]; then
- [ -f /etc/fstab ] && fstab_mount /etc/fstab
-fi
+[ -f /etc/fstab ] && fstab_mount /etc/fstab
# prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
if [ -f "$NEWROOT"/etc/fstab.sys ]; then
-diff -ur dracut-ng-106.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-ng-106/modules.d/95iscsi/cleanup-iscsi.sh
---- dracut-ng-106.orig/modules.d/95iscsi/cleanup-iscsi.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95iscsi/cleanup-iscsi.sh 2025-04-19 11:33:25.466453288 +0200
+diff -ur dracut-111.orig/modules.d/74iscsi/cleanup-iscsi.sh dracut-111/modules.d/74iscsi/cleanup-iscsi.sh
+--- dracut-111.orig/modules.d/74iscsi/cleanup-iscsi.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74iscsi/cleanup-iscsi.sh 2026-05-19 19:32:23.845897402 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
--if [ -z "${DRACUT_SYSTEMD}" ] && { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
+-if [ -z "${DRACUT_SYSTEMD-}" ] && { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
+if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
killproc iscsiuio
fi
-diff -ur dracut-ng-106.orig/modules.d/95iscsi/iscsiroot.sh dracut-ng-106/modules.d/95iscsi/iscsiroot.sh
---- dracut-ng-106.orig/modules.d/95iscsi/iscsiroot.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95iscsi/iscsiroot.sh 2025-04-19 11:33:25.466453288 +0200
+diff -ur dracut-111.orig/modules.d/74iscsi/iscsiroot.sh dracut-111/modules.d/74iscsi/iscsiroot.sh
+--- dracut-111.orig/modules.d/74iscsi/iscsiroot.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74iscsi/iscsiroot.sh 2026-05-19 19:32:07.613829498 +0200
@@ -37,8 +37,7 @@
modprobe crc32c 2> /dev/null
# start iscsiuio if needed
--if [ -z "${DRACUT_SYSTEMD}" ] \
+-if [ -z "${DRACUT_SYSTEMD-}" ] \
- && { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; } \
+if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; } \
&& ! [ -e /tmp/iscsiuio-started ]; then
mkdir -p /etc/iscsi
ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
: > /tmp/iscsi_set_initiator
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- systemctl try-restart iscsid
- # FIXME: iscsid is not yet ready, when the service is :-/
- sleep 1
mkdir -p /etc/iscsi
ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
: > /tmp/iscsi_set_initiator
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- systemctl try-restart iscsid
- # FIXME: iscsid is not yet ready, when the service is :-/
- sleep 1
if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then
mkdir -p /etc/iscsi
ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- systemctl try-restart iscsid
- # FIXME: iscsid is not yet ready, when the service is :-/
- sleep 1
- fi
fi
-- if [ -z "$DRACUT_SYSTEMD" ]; then
+- if [ -z "${DRACUT_SYSTEMD-}" ]; then
- iscsid
- sleep 2
- fi
wait_for_dev -n /dev/root
# install mount script
-- [ -z "$DRACUT_SYSTEMD" ] \
+- [ -z "${DRACUT_SYSTEMD-}" ] \
- && echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > "$hookdir"/mount/01-$$-iscsi.sh
+ echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > "$hookdir"/mount/01-$$-iscsi.sh
fi
if strglobin "$iscsi_target_ip" '*:*:*' && ! strglobin "$iscsi_target_ip" '['; then
-diff -ur dracut-ng-106.orig/modules.d/95iscsi/module-setup.sh dracut-ng-106/modules.d/95iscsi/module-setup.sh
---- dracut-ng-106.orig/modules.d/95iscsi/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95iscsi/module-setup.sh 2025-04-19 11:40:42.151445657 +0200
-@@ -208,77 +208,7 @@
+diff -ur dracut-111.orig/modules.d/74iscsi/module-setup.sh dracut-111/modules.d/74iscsi/module-setup.sh
+--- dracut-111.orig/modules.d/74iscsi/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74iscsi/module-setup.sh 2026-05-19 19:30:47.953496245 +0200
+@@ -207,76 +207,7 @@
inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
- "$systemdsystemunitdir"/iscsiuio.socket \
- "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket \
- "$systemdsystemunitdir"/sockets.target.wants/iscsiuio.socket
-- if grep -q '^ExecStartPre=/usr/lib/open-iscsi/startup-checks.sh$' "$systemdsystemunitdir/iscsid.service"; then
-- inst_simple /usr/lib/open-iscsi/startup-checks.sh
-- fi
+- sed -i '/ExecStartPre=\/usr\/lib\/open-iscsi\/startup-checks.sh/d' \
+- "${initdir}$systemdsystemunitdir/iscsid.service"
-
-- for i in \
-- iscsid.socket \
-- iscsiuio.socket; do
-- $SYSTEMCTL -q --root "$initdir" enable "$i"
+- for i in iscsid.socket iscsiuio.socket; do
+- if [[ -e "${initdir}$systemdsystemunitdir/$i" ]]; then
+- $SYSTEMCTL -q --root "$initdir" enable "$i"
+- fi
- done
-
- mkdir -p "${initdir}/$systemdsystemunitdir/iscsid.service.d"
- {
- echo "[Unit]"
- echo "DefaultDependencies=no"
-- echo "Conflicts=shutdown.target"
-- echo "Before=shutdown.target"
+- echo "Conflicts=shutdown.target initrd-cleanup.service"
+- echo "Before=shutdown.target initrd-cleanup.service"
- } > "${initdir}/$systemdsystemunitdir/iscsid.service.d/dracut.conf"
-
- mkdir -p "${initdir}/$systemdsystemunitdir/iscsid.socket.d"
- {
- echo "[Unit]"
- echo "DefaultDependencies=no"
-- echo "Conflicts=shutdown.target"
-- echo "Before=shutdown.target"
+- echo "Conflicts=shutdown.target initrd-cleanup.service"
+- echo "Before=shutdown.target initrd-cleanup.service"
- } > "${initdir}/$systemdsystemunitdir/iscsiuio.service.d/dracut.conf"
-
- mkdir -p "${initdir}/$systemdsystemunitdir/iscsiuio.socket.d"
inst_dir /var/lib/iscsi
mkdir -p "${initdir}/var/lib/iscsi/nodes"
# Fedora 34 iscsid wants a non-empty /var/lib/iscsi/nodes directory
-diff -ur dracut-ng-106.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-ng-106/modules.d/95iscsi/parse-iscsiroot.sh
---- dracut-ng-106.orig/modules.d/95iscsi/parse-iscsiroot.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95iscsi/parse-iscsiroot.sh 2025-04-19 11:41:35.483566932 +0200
+diff -ur dracut-111.orig/modules.d/74iscsi/parse-iscsiroot.sh dracut-111/modules.d/74iscsi/parse-iscsiroot.sh
+--- dracut-111.orig/modules.d/74iscsi/parse-iscsiroot.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74iscsi/parse-iscsiroot.sh 2026-05-19 19:30:13.865353633 +0200
@@ -42,7 +42,6 @@
netroot=$root
# if root is not specified try to mount the whole iSCSI LUN
printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
-- [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
+- [ -n "${DRACUT_SYSTEMD-}" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
root=/dev/root
write_fs_tab /dev/root
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
-- [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
+- [ -n "${DRACUT_SYSTEMD-}" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
fi
if [ -n "$iscsiroot" ]; then
-@@ -85,7 +83,7 @@
+@@ -86,7 +84,7 @@
modprobe -b -q iscsi_boot_sysfs 2> /dev/null
modprobe -b -q iscsi_ibft
# if no ip= is given, but firmware
/sbin/initqueue --unique --online /sbin/iscsiroot online "iscsi:" "$NEWROOT"
/sbin/initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "iscsi:" "$NEWROOT"
/sbin/initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
-@@ -115,11 +113,6 @@
+@@ -116,11 +114,6 @@
rm -f /etc/iscsi/initiatorname.iscsi
mkdir -p /etc/iscsi
ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- systemctl try-restart iscsid
- # FIXME: iscsid is not yet ready, when the service is :-/
- sleep 1
fi
# If not given on the cmdline and initiator-name available via iBFT
-@@ -131,11 +124,6 @@
+@@ -132,11 +125,6 @@
mkdir -p /etc/iscsi
ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
: > /tmp/iscsi_set_initiator
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- systemctl try-restart iscsid
- # FIXME: iscsid is not yet ready, when the service is :-/
- sleep 1
fi
fi
-@@ -150,7 +138,7 @@
+@@ -151,7 +139,7 @@
command -v parse_iscsi_root > /dev/null || . /lib/net-lib.sh
parse_iscsi_root "$nroot" || return 1
netroot_enc=$(str_replace "$nroot" '/' '\2f')
done
# Done, all good!
-diff -ur dracut-ng-106.orig/modules.d/95nbd/module-setup.sh dracut-ng-106/modules.d/95nbd/module-setup.sh
---- dracut-ng-106.orig/modules.d/95nbd/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95nbd/module-setup.sh 2025-04-19 11:33:29.738463002 +0200
-@@ -32,8 +32,5 @@
+diff -ur dracut-111.orig/modules.d/74nbd/module-setup.sh dracut-111/modules.d/74nbd/module-setup.sh
+--- dracut-111.orig/modules.d/74nbd/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74nbd/module-setup.sh 2026-05-19 19:15:59.637751476 +0200
+@@ -32,7 +32,4 @@
inst nbd-client
inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"
inst_script "$moddir/nbdroot.sh" "/sbin/nbdroot"
-- if dracut_module_included "systemd-initrd"; then
+- if dracut_module_included "systemd"; then
- inst_script "$moddir/nbd-generator.sh" "$systemdutildir"/system-generators/dracut-nbd-generator
- fi
- dracut_need_initqueue
}
-diff -ur dracut-ng-106.orig/modules.d/95nbd/nbdroot.sh dracut-ng-106/modules.d/95nbd/nbdroot.sh
---- dracut-ng-106.orig/modules.d/95nbd/nbdroot.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95nbd/nbdroot.sh 2025-04-19 11:37:45.095043053 +0200
+diff -ur dracut-111.orig/modules.d/74nbd/nbdroot.sh dracut-111/modules.d/74nbd/nbdroot.sh
+--- dracut-111.orig/modules.d/74nbd/nbdroot.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74nbd/nbdroot.sh 2026-05-19 19:16:30.465882091 +0200
@@ -101,27 +101,13 @@
udevadm control --reload
wait_for_dev -n /dev/root
-- if [ -z "$DRACUT_SYSTEMD" ]; then
+- if [ -z "${DRACUT_SYSTEMD-}" ]; then
- command -v write_fs_tab > /dev/null || . /lib/fs-lib.sh
+ command -v write_fs_tab > /dev/null || . /lib/fs-lib.sh
fi
if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then
-diff -ur dracut-ng-106.orig/modules.d/95resume/module-setup.sh dracut-ng-106/modules.d/95resume/module-setup.sh
---- dracut-ng-106.orig/modules.d/95resume/module-setup.sh 2025-04-19 11:24:06.833185848 +0200
-+++ dracut-ng-106/modules.d/95resume/module-setup.sh 2025-04-19 11:33:29.738463002 +0200
-@@ -58,16 +58,6 @@
- [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf"
+diff -ur dracut-111.orig/modules.d/74resume/module-setup.sh dracut-111/modules.d/74resume/module-setup.sh
+--- dracut-111.orig/modules.d/74resume/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74resume/module-setup.sh 2026-05-19 19:32:54.030023691 +0200
+@@ -39,9 +39,7 @@
+
+ # called by dracut
+ depends() {
+- if ! dracut_module_included "systemd"; then
+- echo initqueue
+- fi
++ echo initqueue
+ return 0
+ }
+
+@@ -66,15 +64,6 @@
+ [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/20-resume.conf"
fi
- # if systemd is included and has the hibernate-resume tool, use it and nothing else
-- if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
+- if dracut_module_included "systemd"; 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
- fi
-
# Optional uswsusp support
- for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume; do
- [[ -x $dracutsysrootdir${_bin} ]] && {
-@@ -77,11 +67,7 @@
- }
- done
-
-- if ! dracut_module_included "systemd"; then
-- inst_hook cmdline 10 "$moddir/parse-resume.sh"
-- else
-- inst_script "$moddir/parse-resume.sh" /lib/dracut/parse-resume.sh
-- fi
-+ inst_hook cmdline 10 "$moddir/parse-resume.sh"
-
- inst_script "$moddir/resume.sh" /lib/dracut/resume.sh
- }
-diff -ur dracut-ng-106.orig/modules.d/95rootfs-block/module-setup.sh dracut-ng-106/modules.d/95rootfs-block/module-setup.sh
---- dracut-ng-106.orig/modules.d/95rootfs-block/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95rootfs-block/module-setup.sh 2025-04-19 11:33:29.738463002 +0200
+ for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib64/suspend/resume /usr/lib/uswsusp/resume /usr/lib64/uswsusp/resume; do
+ [[ -x "${dracutsysrootdir-}${_bin}" ]] && {
+diff -ur dracut-111.orig/modules.d/74rootfs-block/module-setup.sh dracut-111/modules.d/74rootfs-block/module-setup.sh
+--- dracut-111.orig/modules.d/74rootfs-block/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74rootfs-block/module-setup.sh 2026-05-19 18:37:40.011820552 +0200
@@ -75,11 +75,9 @@
inst_multiple umount
+ inst_hook pre-udev 30 "$moddir/block-genrules.sh"
+ inst_hook mount 99 "$moddir/mount-root.sh"
- inst_hook initqueue/timeout 99 "$moddir/rootfallback.sh"
-
-diff -ur dracut-ng-106.orig/modules.d/95udev-rules/module-setup.sh dracut-ng-106/modules.d/95udev-rules/module-setup.sh
---- dracut-ng-106.orig/modules.d/95udev-rules/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/95udev-rules/module-setup.sh 2025-04-19 11:33:29.738463002 +0200
-@@ -9,18 +9,13 @@
+ inst_rules \
+ "$moddir/59-persistent-storage.rules" \
+diff -ur dracut-111.orig/modules.d/74udev-rules/module-setup.sh dracut-111/modules.d/74udev-rules/module-setup.sh
+--- dracut-111.orig/modules.d/74udev-rules/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/74udev-rules/module-setup.sh 2026-05-19 19:26:52.628511751 +0200
+@@ -9,18 +9,10 @@
# 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
-+ for _i in /sbin/udevd; do
- [[ -x $dracutsysrootdir$_i ]] || continue
- inst "$_i"
+- [[ -x "${dracutsysrootdir-}$_i" ]] || continue
+- inst "$_i"
-
- if ! [[ -f ${initdir}${systemdutildir}/systemd-udevd ]]; then
- ln -fs "$_i" "${initdir}${systemdutildir}"/systemd-udevd
- fi
- break
- done
+- break
+- done
- if ! [[ -e ${initdir}${systemdutildir}/systemd-udevd ]]; then
- derror "Cannot find [systemd-]udevd binary!"
-+ if ! [[ -e /sbin/udevd ]]; then
++ if [[ -e /sbin/udevd ]]; then
++ inst /sbin/udevd
++ else
+ derror "Cannot find udevd binary!"
exit 1
fi
-diff -ur dracut-ng-106.orig/modules.d/98usrmount/module-setup.sh dracut-ng-106/modules.d/98usrmount/module-setup.sh
---- dracut-ng-106.orig/modules.d/98usrmount/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/98usrmount/module-setup.sh 2025-04-19 11:33:29.738463002 +0200
-@@ -13,8 +13,6 @@
+diff -ur dracut-111.orig/modules.d/77initqueue/dracut-initqueue.sh dracut-111/modules.d/77initqueue/dracut-initqueue.sh
+--- dracut-111.orig/modules.d/77initqueue/dracut-initqueue.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/77initqueue/dracut-initqueue.sh 2026-05-19 20:08:16.318971281 +0200
+@@ -1,6 +1,5 @@
+ #!/bin/sh
+
+-export DRACUT_SYSTEMD=1
+ if [ -f /dracut-state.sh ]; then
+ . /dracut-state.sh 2> /dev/null
+ fi
+@@ -50,10 +49,6 @@
+ # no more udev jobs and queues empty.
+ sleep 0.5
+
+- for i in /run/systemd/ask-password/ask.*; do
+- [ -e "$i" ] && continue 2
+- done
+-
+ if [ $main_loop -gt $((2 * RDRETRY / 3)) ]; then
+ warn "dracut-initqueue: timeout, still waiting for following initqueue hooks:"
+ for _f in $(list_hooks "initqueue/finished"); do
+diff -ur dracut-111.orig/modules.d/77initqueue/module-setup.sh dracut-111/modules.d/77initqueue/module-setup.sh
+--- dracut-111.orig/modules.d/77initqueue/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/77initqueue/module-setup.sh 2026-05-19 19:55:04.651616844 +0200
+@@ -10,15 +10,5 @@
+ # called by dracut
+ install() {
+ inst_script "$moddir/initqueue.sh" "/sbin/initqueue"
+-
+- if dracut_module_included "systemd"; then
+- inst_script "$moddir/dracut-initqueue.sh" /usr/bin/dracut-initqueue
+- inst_simple "$moddir/dracut-initqueue.service" "$systemdsystemunitdir/dracut-initqueue.service"
+- inst_simple "$systemdsystemunitdir"/initrd.target.wants/dracut-initqueue.service
+-
+- # Enable systemd type unit(s)
+- $SYSTEMCTL -q --root "$initdir" enable dracut-initqueue.service
+- fi
+-
+ dracut_need_initqueue
+ }
+diff -ur dracut-111.orig/modules.d/77usrmount/module-setup.sh dracut-111/modules.d/77usrmount/module-setup.sh
+--- dracut-111.orig/modules.d/77usrmount/module-setup.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/77usrmount/module-setup.sh 2026-05-19 20:05:17.690212751 +0200
+@@ -13,8 +13,5 @@
# called by dracut
install() {
- if ! dracut_module_included "systemd"; then
- inst_hook pre-pivot 50 "$moddir/mount-usr.sh"
- fi
+- :
+ inst_hook pre-pivot 50 "$moddir/mount-usr.sh"
- :
}
-diff -ur dracut-ng-106.orig/modules.d/99base/dracut-dev-lib.sh dracut-ng-106/modules.d/99base/dracut-dev-lib.sh
---- dracut-ng-106.orig/modules.d/99base/dracut-dev-lib.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/99base/dracut-dev-lib.sh 2025-04-19 11:33:29.738463002 +0200
-@@ -25,11 +25,6 @@
+diff -ur dracut-111.orig/modules.d/80base/dracut-dev-lib.sh dracut-111/modules.d/80base/dracut-dev-lib.sh
+--- dracut-111.orig/modules.d/80base/dracut-dev-lib.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/80base/dracut-dev-lib.sh 2026-05-19 19:41:22.832152432 +0200
+@@ -25,14 +25,6 @@
dev_unit_name() {
local dev="$1"
- if command -v systemd-escape > /dev/null; then
-- systemd-escape -p -- "$dev"
+- case $dev in
+- */*) systemd-escape -p -- "$dev" ;;
+- *) systemd-escape -- "$dev" ;;
+- esac
- return $?
- fi
-
if [ "$dev" = "/" ] || [ -z "$dev" ]; then
printf -- "-"
return 0
-@@ -48,53 +43,6 @@
+@@ -51,47 +43,6 @@
printf -- "%s" "$dev"
}
- local _noreload
- local _timeout
-
-- [ -z "$DRACUT_SYSTEMD" ] && return 0
+- [ -z "${DRACUT_SYSTEMD-}" ] && return 0
-
- if [ "$1" = "-n" ]; then
- _noreload=1
- _timeout=$(getarg rd.timeout)
- fi
-
-- _timeout=${_timeout:-0}
+- _timeout=${_timeout:-infinity}
-
- _name=$(dev_unit_name "$1")
-- if ! [ -L "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device" ]; then
-- [ -d "${PREFIX}"/etc/systemd/system/initrd.target.wants ] || mkdir -p "${PREFIX}"/etc/systemd/system/initrd.target.wants
-- ln -s ../"${_name}".device "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device"
-- type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/initrd.target.wants/"${_name}".device
-- _needreload=1
-- fi
-
-- if ! [ -f "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf" ]; then
-- mkdir -p "${PREFIX}/etc/systemd/system/${_name}.device.d"
+- if ! [ -f "${PREFIX-}/etc/systemd/system/${_name}.device.d/timeout.conf" ]; then
+- mkdir -p "${PREFIX-}/etc/systemd/system/${_name}.device.d"
- {
- echo "[Unit]"
- echo "JobTimeoutSec=$_timeout"
- echo "JobRunningTimeoutSec=$_timeout"
-- } > "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf"
+- } > "${PREFIX-}/etc/systemd/system/${_name}.device.d/timeout.conf"
- type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/"${_name}".device.d/timeout.conf
- _needreload=1
- fi
-
-- if [ -z "$PREFIX" ] && [ "$_needreload" = 1 ] && [ -z "$_noreload" ]; then
+- if [ -z "${PREFIX-}" ] && [ "$_needreload" = 1 ] && [ -z "$_noreload" ]; then
- /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
- fi
-}
# wait_for_dev <dev> [<timeout>]
#
# Installs a initqueue-finished script,
-@@ -122,7 +70,6 @@
+@@ -120,22 +71,6 @@
+ printf '[ -e "%s" ] || ' "$1"
printf 'warn "\"%s\" does not exist"\n' "$1"
- } >> "${PREFIX}$hookdir/emergency/80-${_name}.sh"
-
+ } >> "${PREFIX-}$hookdir/emergency/80-${_name}.sh"
+-
+- [ -n "${DRACUT_SYSTEMD-}" ] || return 0
+- _unit="$(dev_unit_name "$1").device"
+-
+- if ! [ -L "${PREFIX-}/etc/systemd/system/initrd.target.wants/${_unit}" ]; then
+- [ -d "${PREFIX-}"/etc/systemd/system/initrd.target.wants ] || mkdir -p "${PREFIX-}"/etc/systemd/system/initrd.target.wants
+- ln -s ../"${_unit}" "${PREFIX-}/etc/systemd/system/initrd.target.wants/${_unit}"
+- type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/initrd.target.wants/"${_unit}"
+- _needreload=1
+- fi
+-
+- if [ -z "${PREFIX-}" ] && [ "$_needreload" = 1 ] && [ -z "$_noreload" ]; then
+- /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
+- fi
+-
- set_systemd_timeout_for_dev $_noreload "$@"
}
cancel_wait_for_dev() {
-@@ -130,10 +77,4 @@
+@@ -143,10 +78,4 @@
_name="$(str_replace "$1" '/' '\x2f')"
rm -f -- "$hookdir/initqueue/finished/devexists-${_name}.sh"
rm -f -- "$hookdir/emergency/80-${_name}.sh"
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- _name=$(dev_unit_name "$1")
-- rm -f -- "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device"
-- rm -f -- "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf"
+- rm -f -- "${PREFIX-}/etc/systemd/system/initrd.target.wants/${_name}.device"
+- rm -f -- "${PREFIX-}/etc/systemd/system/${_name}.device.d/timeout.conf"
- /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
- fi
}
-diff -ur dracut-ng-106.orig/modules.d/99base/dracut-lib.sh dracut-ng-106/modules.d/99base/dracut-lib.sh
---- dracut-ng-106.orig/modules.d/99base/dracut-lib.sh 2025-04-19 11:27:11.221604182 +0200
-+++ dracut-ng-106/modules.d/99base/dracut-lib.sh 2025-04-19 11:33:29.738463002 +0200
+diff -ur dracut-111.orig/modules.d/80base/dracut-lib.sh dracut-111/modules.d/80base/dracut-lib.sh
+--- dracut-111.orig/modules.d/80base/dracut-lib.sh 2026-05-19 18:27:17.444888644 +0200
++++ dracut-111/modules.d/80base/dracut-lib.sh 2026-05-19 19:42:44.164493925 +0200
@@ -2,7 +2,6 @@
command -v wait_for_dev > /dev/null || . /lib/dracut-dev-lib.sh
export NEWROOT
if [ -n "$NEWROOT" ]; then
[ -d "$NEWROOT" ] || mkdir -p -m 0755 "$NEWROOT"
-@@ -64,33 +63,19 @@
+@@ -65,33 +64,19 @@
printf "%s" "$var"
}
--if [ -z "$DRACUT_SYSTEMD" ]; then
+-if [ -z "${DRACUT_SYSTEMD-}" ]; then
-
- warn() {
- check_quiet
vwarn() {
while read -r line || [ -n "$line" ]; do
-@@ -423,10 +408,6 @@
+@@ -440,10 +425,6 @@
source_hook "shutdown-emergency"
fi
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- systemctl --no-block --force poweroff
- fi
-
exit 1
}
-@@ -835,43 +816,35 @@
+@@ -852,43 +833,35 @@
_emergency_shell() {
local _name="$1"
-- if [ -n "$DRACUT_SYSTEMD" ]; then
+- if [ -n "${DRACUT_SYSTEMD-}" ]; then
- : > /.console_lock
- echo "PS1=\"$_name:\\\${PWD}# \"" > /etc/profile
- systemctl start dracut-emergency.service
}
emergency_shell() {
-diff -ur dracut-ng-106.orig/modules.d/99base/init.sh dracut-ng-106/modules.d/99base/init.sh
---- dracut-ng-106.orig/modules.d/99base/init.sh 2025-04-19 11:27:11.221604182 +0200
-+++ dracut-ng-106/modules.d/99base/init.sh 2025-04-19 11:33:29.738463002 +0200
-@@ -147,7 +147,7 @@
- && UDEV_LOG=debug
+diff -ur dracut-111.orig/modules.d/80base/init.sh dracut-111/modules.d/80base/init.sh
+--- dracut-111.orig/modules.d/80base/init.sh 2026-05-19 18:26:54.528775452 +0200
++++ dracut-111/modules.d/80base/init.sh 2026-05-19 19:35:55.758784030 +0200
+@@ -150,7 +150,7 @@
+ echo "udev_log=${UDEV_LOG}" >> /etc/udev/udev.conf
# start up udev and trigger cold plugs
--UDEV_LOG=$UDEV_LOG "$systemdutildir"/systemd-udevd --daemon --resolve-names=never
-+UDEV_LOG=$UDEV_LOG /sbin/udevd --daemon --resolve-names=never
+-"$systemdutildir"/systemd-udevd --daemon --resolve-names=never
++/sbin/udevd --daemon --resolve-names=never
UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
-diff -ur dracut-ng-106.orig/modules.d/99base/module-setup.sh dracut-ng-106/modules.d/99base/module-setup.sh
---- dracut-ng-106.orig/modules.d/99base/module-setup.sh 2025-04-19 11:28:05.105726430 +0200
-+++ dracut-ng-106/modules.d/99base/module-setup.sh 2025-04-19 11:33:29.738463002 +0200
-@@ -70,11 +70,9 @@
- inst_simple "$moddir/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
- mkdir -p "${initdir}"/var
+diff -ur dracut-111.orig/modules.d/80base/module-setup.sh dracut-111/modules.d/80base/module-setup.sh
+--- dracut-111.orig/modules.d/80base/module-setup.sh 2026-05-19 18:27:36.064980624 +0200
++++ dracut-111/modules.d/80base/module-setup.sh 2026-05-19 19:35:24.866654781 +0200
+@@ -19,9 +19,6 @@
+ # due to the dependency, this dracut module needs to be ordered before the busybox dracut module
+ # as this dracut module would install the non-busybox implementation of switch_root, if available
+
+-# this dracut module needs to be ordered after the systemd-sysusers dracut module, so make sure
+-# that the root password set in for the emergency console in host-only mode
+-
+ # called by dracut
+ install() {
+ inst_multiple \
+@@ -75,7 +72,6 @@
+ mv "$initdir/etc/shadow-" "$initdir/etc/shadow"
+ fi
+ # replace root password in the existing entry in etc/shadow
+- # root password from host takes precedence over root password set by systemd-sysuser in hostonly mode
+ # create a new entry for root in /etc/shadow
+ grep '^root:' "${dracutsysrootdir-}"/etc/shadow >> "$initdir/etc/shadow"
+ fi
+@@ -100,19 +96,17 @@
+
+ inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
- 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 01 "$moddir/parse-kernel.sh"
- inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
+-
+- {
+- echo "NAME=dracut"
+- echo "ID=dracut"
+- echo "VERSION_ID=\"$DRACUT_VERSION\""
+- echo 'ANSI_COLOR="0;34"'
+- } > "${initdir}"/etc/initrd-release
- fi
+ inst_multiple switch_root || dfatal "Failed to install switch_root"
+ inst_script "$moddir/init.sh" "/init"
++ inst_hook cmdline 01 "$moddir/parse-kernel.sh"
+ inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
++
++ {
++ echo "NAME=dracut"
++ echo "ID=dracut"
++ echo "VERSION_ID=\"$DRACUT_VERSION\""
++ echo 'ANSI_COLOR="0;34"'
++ } > "${initdir}"/etc/initrd-release
ln -fs /proc/self/mounts "$initdir/etc/mtab"
if [[ $ro_mnt == yes ]]; then
-@@ -95,11 +93,8 @@
+@@ -126,11 +120,8 @@
if [[ -n ${host_devs[*]} ]] || [[ -n ${user_devs[*]} ]]; then
dracut_need_initqueue
fi
- export DRACUT_SYSTEMD=1
- fi
export PREFIX="$initdir"
- export hookdir=/lib/dracut/hooks
+ export hookdir=/var/lib/dracut/hooks
-diff -ur dracut-ng-106.orig/modules.d/99shutdown/shutdown.sh dracut-ng-106/modules.d/99shutdown/shutdown.sh
---- dracut-ng-106.orig/modules.d/99shutdown/shutdown.sh 2025-02-01 02:20:41.000000000 +0100
-+++ dracut-ng-106/modules.d/99shutdown/shutdown.sh 2025-04-19 11:33:29.738463002 +0200
-@@ -149,12 +149,6 @@
+diff -ur dracut-111.orig/modules.d/86shutdown/shutdown.sh dracut-111/modules.d/86shutdown/shutdown.sh
+--- dracut-111.orig/modules.d/86shutdown/shutdown.sh 2026-05-02 15:21:57.000000000 +0200
++++ dracut-111/modules.d/86shutdown/shutdown.sh 2026-05-19 18:37:41.487827022 +0200
+@@ -152,12 +152,6 @@
done
[ $_cnt -ge 40 ] && _check_shutdown final
TLD / packages / dracut.git / commitdiff