1 diff -urpa dracut-059.orig/dracut-init.sh dracut-059/dracut-init.sh
2 --- dracut-059.orig/dracut-init.sh 2022-12-24 17:49:27.000000000 +0100
3 +++ dracut-059/dracut-init.sh 2024-04-03 01:34:16.263871644 +0200
4 @@ -1183,16 +1183,6 @@ fi
5 is_qemu_virtualized() {
6 # 0 if a virt environment was detected
7 # 1 if a virt environment could not be detected
8 - # 255 if any error was encountered
9 - if type -P systemd-detect-virt > /dev/null 2>&1; then
10 - if ! vm=$(systemd-detect-virt --vm > /dev/null 2>&1); then
13 - [[ $vm == "qemu" ]] && return 0
14 - [[ $vm == "kvm" ]] && return 0
15 - [[ $vm == "bochs" ]] && return 0
18 for i in /sys/class/dmi/id/*_vendor; do
19 [[ -f $i ]] || continue
21 diff -urpa dracut-059.orig/dracut-logger.sh dracut-059/dracut-logger.sh
22 --- dracut-059.orig/dracut-logger.sh 2022-12-24 17:49:27.000000000 +0100
23 +++ dracut-059/dracut-logger.sh 2024-04-03 01:35:06.456549565 +0200
24 @@ -142,16 +142,7 @@ dlog_init() {
27 if ((sysloglvl > 0)); then
28 - if [[ -d /run/systemd/journal ]] \
29 - && type -P systemd-cat &> /dev/null \
30 - && systemctl --quiet is-active systemd-journald.socket &> /dev/null \
31 - && { echo "dracut-$DRACUT_VERSION" | systemd-cat -t 'dracut' &> /dev/null; }; then
32 - readonly _systemdcatfile="$DRACUT_TMPDIR/systemd-cat"
33 - mkfifo "$_systemdcatfile"
35 - systemd-cat -t 'dracut' --level-prefix=true < "$_systemdcatfile" &
36 - exec 15> "$_systemdcatfile"
37 - elif ! ([[ -S /dev/log ]] && [[ -w /dev/log ]] && command -v logger > /dev/null); then
38 + if ! ([[ -S /dev/log ]] && [[ -w /dev/log ]] && command -v logger > /dev/null); then
39 # We cannot log to syslog, so turn this facility off.
42 diff -urpa dracut-059.orig/dracut.sh dracut-059/dracut.sh
43 --- dracut-059.orig/dracut.sh 2024-04-03 01:29:40.532147553 +0200
44 +++ dracut-059/dracut.sh 2024-04-03 01:52:54.446974062 +0200
45 @@ -1285,13 +1285,6 @@ if [[ -f $dracutbasedir/dracut-version.s
46 . "$dracutbasedir"/dracut-version.sh
49 -if systemd-detect-virt -c &> /dev/null; then
50 - export DRACUT_NO_MKNOD=1 DRACUT_NO_XATTR=1
51 - if [[ $hostonly ]]; then
52 - printf "%s\n" "dracut: WARNING: running in hostonly mode in a container!!"
56 if [[ -f $dracutbasedir/dracut-init.sh ]]; then
57 # shellcheck source=./dracut-init.sh
58 . "$dracutbasedir"/dracut-init.sh
59 @@ -1389,19 +1382,6 @@ esac
61 abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
63 -[[ -d $dracutsysrootdir$systemdutildir ]] \
64 - || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2> /dev/null)
66 -if ! [[ -d $dracutsysrootdir$systemdutildir ]]; then
67 - [[ -e $dracutsysrootdir/lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
68 - [[ -e $dracutsysrootdir/usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
71 -[[ -d $dracutsysrootdir$systemdutilconfdir ]] \
72 - || systemdutilconfdir=$(pkg-config systemd --variable=systemdutilconfdir 2> /dev/null)
74 -[[ -d $dracutsysrootdir$systemdutilconfdir ]] || systemdutilconfdir=/etc/systemd
76 if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then
77 if ! [[ -f $srcmods/modules.dep ]]; then
78 if [[ -n "$(find "$srcmods" -name '*.ko*')" ]]; then
79 @@ -1467,10 +1447,6 @@ if [[ ! $print_cmdline ]]; then
82 if ! [[ -s $uefi_stub ]]; then
83 - uefi_stub="$dracutsysrootdir${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
86 - if ! [[ -s $uefi_stub ]]; then
87 dfatal "Can't find a uefi stub '$uefi_stub' to create a UEFI executable"
90 @@ -1722,66 +1698,6 @@ for dev in "${!host_fs_types[@]}"; do
94 -[[ -d $dracutsysrootdir$dbus ]] \
95 - || dbus=$(pkg-config dbus --variable=dbus 2> /dev/null)
97 -[[ -d $dracutsysrootdir$dbus ]] || dbus=/usr/share/dbus-1
99 -[[ -d $dracutsysrootdir$dbusconfdir ]] \
100 - || dbusconfdir=$(pkg-config dbus --variable=dbusconfdir 2> /dev/null)
102 -[[ -d $dracutsysrootdir$dbusconfdir ]] || dbusconfdir=/etc/dbus-1
104 -[[ -d $dracutsysrootdir$dbusinterfaces ]] \
105 - || dbusinterfaces=$(pkg-config dbus --variable=dbusinterfaces 2> /dev/null)
107 -[[ -d $dracutsysrootdir$dbusinterfaces ]] || dbusinterfaces=${dbus}/interfaces
109 -[[ -d $dracutsysrootdir$dbusinterfacesconfdir ]] \
110 - || dbusinterfacesconfdir=$(pkg-config dbus --variable=dbusinterfacesconfdir 2> /dev/null)
112 -[[ -d $dracutsysrootdir$dbusinterfacesconfdir ]] || dbusinterfacesconfdir=${dbusconfdir}/interfaces
114 -[[ -d $dracutsysrootdir$dbusservices ]] \
115 - || dbusservices=$(pkg-config dbus --variable=dbusservices 2> /dev/null)
117 -[[ -d $dracutsysrootdir$dbusservices ]] || dbusservices=${dbus}/services
119 -[[ -d $dracutsysrootdir$dbusservicesconfdir ]] \
120 - || dbusservicesconfdir=$(pkg-config dbus --variable=dbusservicesconfdir 2> /dev/null)
122 -[[ -d $dracutsysrootdir$dbusservicesconfdir ]] || dbusservicesconfdir=${dbusconfdir}/services
124 -[[ -d $dracutsysrootdir$dbussession ]] \
125 - || dbussession=$(pkg-config dbus --variable=dbussession 2> /dev/null)
127 -[[ -d $dracutsysrootdir$dbussession ]] || dbussession=${dbus}/session.d
129 -[[ -d $dracutsysrootdir$dbussessionconfdir ]] \
130 - || dbussessionconfdir=$(pkg-config dbus --variable=dbussessionconfdir 2> /dev/null)
132 -[[ -d $dracutsysrootdir$dbussessionconfdir ]] || dbussessionconfdir=${dbusconfdir}/session.d
134 -[[ -d $dracutsysrootdir$dbussystem ]] \
135 - || dbussystem=$(pkg-config dbus --variable=dbussystem 2> /dev/null)
137 -[[ -d $dracutsysrootdir$dbussystem ]] || dbussystem=${dbus}/system.d
139 -[[ -d $dracutsysrootdir$dbussystemconfdir ]] \
140 - || dbussystemconfdir=$(pkg-config dbus --variable=dbussystemconfdir 2> /dev/null)
142 -[[ -d $dracutsysrootdir$dbussystemconfdir ]] || dbussystemconfdir=${dbusconfdir}/system.d
144 -[[ -d $dracutsysrootdir$dbussystemservices ]] \
145 - || dbussystemservices=$(pkg-config dbus --variable=dbussystemservices 2> /dev/null)
147 -[[ -d $dracutsysrootdir$dbussystemservices ]] || dbussystemservices=${dbus}/system-services
149 -[[ -d $dracutsysrootdir$dbussystemservicesconfdir ]] \
150 - || dbussystemservicesconfdir=$(pkg-config dbus --variable=dbussystemservicesconfdir 2> /dev/null)
152 -[[ -d $dracutsysrootdir$dbussystemservicesconfdir ]] || dbussystemservicesconfdir=${dbusconfdir}/system-services
154 [[ -d $dracutsysrootdir$udevdir ]] \
155 || udevdir="$(pkg-config udev --variable=udevdir 2> /dev/null)"
156 if ! [[ -d $dracutsysrootdir$udevdir ]]; then
157 @@ -1804,114 +1720,22 @@ fi
159 [[ -d $dracutsysrootdir$udevrulesconfdir ]] || udevrulesconfdir=${udevconfdir}/rules.d
161 -[[ -d $dracutsysrootdir$sysctld ]] \
162 - || sysctld=$(pkg-config systemd --variable=sysctld 2> /dev/null)
164 [[ -d $dracutsysrootdir$sysctld ]] || sysctld=/usr/lib/sysctl.d
166 -[[ -d $dracutsysrootdir$sysctlconfdir ]] \
167 - || sysctlconfdir=$(pkg-config systemd --variable=sysctlconfdir 2> /dev/null)
169 [[ -d $dracutsysrootdir$sysctlconfdir ]] || sysctlconfdir=/etc/sysctl.d
171 -[[ -d $dracutsysrootdir$environment ]] \
172 - || environment=$(pkg-config systemd --variable=environment 2> /dev/null)
174 [[ -d $dracutsysrootdir$environment ]] || environment=/usr/lib/environment.d
176 -[[ -d $dracutsysrootdir$environmentconfdir ]] \
177 - || environmentconfdir=$(pkg-config systemd --variable=environmentconfdir 2> /dev/null)
179 [[ -d $dracutsysrootdir$environmentconfdir ]] || environmentconfdir=/etc/environment.d
181 -[[ -d $dracutsysrootdir$systemdcatalog ]] \
182 - || systemdcatalog=$(pkg-config systemd --variable=systemdcatalog 2> /dev/null)
184 -[[ -d $dracutsysrootdir$systemdcatalog ]] || systemdcatalog=${systemdutildir}/catalog
186 -[[ -d $dracutsysrootdir$modulesload ]] \
187 - || modulesload=$(pkg-config systemd --variable=modulesload 2> /dev/null)
189 [[ -d $dracutsysrootdir$modulesload ]] || modulesload=/usr/lib/modules-load.d
191 -[[ -d $dracutsysrootdir$modulesloadconfdir ]] \
192 - || modulesloadconfdir=$(pkg-config systemd --variable=modulesloadconfdir 2> /dev/null)
194 [[ -d $dracutsysrootdir$modulesloadconfdir ]] || modulesloadconfdir=/etc/modules-load.d
196 -[[ -d $dracutsysrootdir$systemdnetwork ]] \
197 - || systemdnetwork=$(pkg-config systemd --variable=systemdnetwork 2> /dev/null)
199 -[[ -d $dracutsysrootdir$systemdnetwork ]] || systemdnetwork=${systemdutildir}/network
201 -[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] \
202 - || systemdnetworkconfdir=$(pkg-config systemd --variable=systemdnetworkconfdir 2> /dev/null)
204 -[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdutilconfdir}/network
206 -[[ -d $dracutsysrootdir$systemdntpunits ]] \
207 - || systemdntpunits=$(pkg-config systemd --variable=systemdntpunits 2> /dev/null)
209 -[[ -d $dracutsysrootdir$systemdntpunits ]] || systemdntpunits=${systemdutildir}/ntp-units.d
211 -[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] \
212 - || systemdntpunitsconfdir=$(pkg-config systemd --variable=systemdntpunitsconfdir 2> /dev/null)
214 -[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdutilconfdir}/ntp-units.d
216 -[[ -d $dracutsysrootdir$systemdportable ]] \
217 - || systemdportable=$(pkg-config systemd --variable=systemdportable 2> /dev/null)
219 -[[ -d $dracutsysrootdir$systemdportable ]] || systemdportable=${systemdutildir}/portable
221 -[[ -d $dracutsysrootdir$systemdportableconfdir ]] \
222 - || systemdportableconfdir=$(pkg-config systemd --variable=systemdportableconfdir 2> /dev/null)
224 -[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdutilconfdir}/portable
226 -[[ -d $dracutsysrootdir$systemdsystemunitdir ]] \
227 - || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2> /dev/null)
229 -[[ -d "$dracutsysrootdir$systemdsystemunitdir" ]] || systemdsystemunitdir=${systemdutildir}/system
231 -[[ -d $dracutsysrootdir$systemduser ]] \
232 - || systemduser=$(pkg-config systemd --variable=systemduser 2> /dev/null)
234 -[[ -d $dracutsysrootdir$systemduser ]] || systemduser=${systemdutildir}/user
236 -[[ -d $dracutsysrootdir$systemduserconfdir ]] \
237 - || systemduserconfdir=$(pkg-config systemd --variable=systemduserconfdir 2> /dev/null)
239 -[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdutilconfdir}/user
241 -[[ -d $dracutsysrootdir$systemdsystemconfdir ]] \
242 - || systemdsystemconfdir=$(pkg-config systemd --variable=systemdsystemconfdir 2> /dev/null)
244 -[[ -d $dracutsysrootdir$systemdsystemconfdir ]] || systemdsystemconfdir=/etc/systemd/system
246 -[[ -d $dracutsysrootdir$sysusers ]] \
247 - || sysusers=$(pkg-config systemd --variable=sysusers 2> /dev/null)
249 [[ -d $dracutsysrootdir$sysusers ]] || sysusers=/usr/lib/sysusers.d
251 -[[ -d $dracutsysrootdir$sysusersconfdir ]] \
252 - || sysusersconfdir=$(pkg-config systemd --variable=sysusersconfdir 2> /dev/null)
254 [[ -d $dracutsysrootdir$sysusersconfdir ]] || sysusersconfdir=/etc/sysusers.d
256 -[[ -d $dracutsysrootdir$tmpfilesdir ]] \
257 - || tmpfilesdir=$(pkg-config systemd --variable=tmpfilesdir 2> /dev/null)
259 -if ! [[ -d $dracutsysrootdir$tmpfilesdir ]]; then
260 - [[ -d $dracutsysrootdir/lib/tmpfiles.d ]] && tmpfilesdir=/lib/tmpfiles.d
261 - [[ -d $dracutsysrootdir/usr/lib/tmpfiles.d ]] && tmpfilesdir=/usr/lib/tmpfiles.d
264 -[[ -d $dracutsysrootdir$tmpfilesconfdir ]] \
265 - || tmpfilesconfdir=$(pkg-config systemd --variable=tmpfilesconfdir 2> /dev/null)
267 -[[ -d $dracutsysrootdir$tmpfilesconfdir ]] || tmpfilesconfdir=/etc/tmpfiles.d
269 [[ -d $dracutsysrootdir$depmodd ]] \
270 || depmodd=$(pkg-config libkmod --variable=depmodd 2> /dev/null)
272 @@ -1931,17 +1755,9 @@ export initdir dracutbasedir \
273 stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
274 debug host_fs_types host_devs swap_devs sshkey add_fstab \
275 DRACUT_VERSION udevdir udevconfdir udevrulesdir udevrulesconfdir \
276 - prefix filesystems drivers dbus dbusconfdir dbusinterfaces \
277 - dbusinterfacesconfdir dbusservices dbusservicesconfdir dbussession \
278 - dbussessionconfdir dbussystem dbussystemconfdir dbussystemservices \
279 - dbussystemservicesconfdir environment environmentconfdir modulesload \
280 + prefix filesystems drivers environment environmentconfdir modulesload \
281 modulesloadconfdir sysctld sysctlconfdir sysusers sysusersconfdir \
282 - systemdutildir systemdutilconfdir systemdcatalog systemdnetwork \
283 - systemdnetworkconfdir systemdntpunits systemdntpunitsconfdir \
284 - systemdportable systemdportableconfdir systemdsystemunitdir \
285 - systemdsystemconfdir systemduser systemduserconfdir \
286 - hostonly_cmdline loginstall tmpfilesdir tmpfilesconfdir depmodd \
288 + hostonly_cmdline loginstall depmodd depmodconfdir
291 # check all our modules to see if they should be sourced.
292 @@ -2169,17 +1985,6 @@ if [[ $kernel_only != yes ]]; then
293 cat "$f" >> "${initdir}/etc/fstab"
296 - if [[ $dracutsysrootdir$systemdutildir ]]; then
297 - if [[ -d ${initdir}/$systemdutildir ]]; then
298 - mkdir -p "${initdir}"/etc/conf.d
300 - printf "%s\n" "systemdutildir=\"$systemdutildir\""
301 - printf "%s\n" "systemdsystemunitdir=\"$systemdsystemunitdir\""
302 - printf "%s\n" "systemdsystemconfdir=\"$systemdsystemconfdir\""
303 - } > "${initdir}"/etc/conf.d/systemd.conf
307 if [[ $DRACUT_RESOLVE_LAZY ]] && [[ $DRACUT_INSTALL ]]; then
308 dinfo "*** Resolving executable dependencies ***"
309 # shellcheck disable=SC2086
310 @@ -2712,25 +2517,4 @@ freeze_ok_for_fstype() {
314 -# We sync/fsfreeze only if we're operating on a live booted system.
315 -# It's possible for e.g. `kernel` to be installed as an RPM BuildRequires or equivalent,
316 -# and there's no reason to sync, and *definitely* no reason to fsfreeze.
317 -# Another case where this happens is rpm-ostree, which performs its own sync/fsfreeze
318 -# globally. See e.g. https://github.com/ostreedev/ostree/commit/8642ef5ab3fec3ac8eb8f193054852f83a8bc4d0
319 -if [[ -d $dracutsysrootdir/run/systemd/system ]]; then
320 - if ! sync "$outfile" 2> /dev/null; then
321 - dinfo "sync operation on newly created initramfs $outfile failed"
325 - # use fsfreeze only if we're not writing to /
326 - if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
327 - FSFROZEN="$(dirname "$outfile")"
328 - if ! (fsfreeze -f "${FSFROZEN}" 2> /dev/null && fsfreeze -u "${FSFROZEN}" 2> /dev/null); then
329 - dwarn "Could not fsfreeze $(dirname "$outfile")"
336 diff -urpa dracut-059.orig/man/dracut.cmdline.7.asc dracut-059/man/dracut.cmdline.7.asc
337 --- dracut-059.orig/man/dracut.cmdline.7.asc 2022-12-24 17:49:27.000000000 +0100
338 +++ dracut-059/man/dracut.cmdline.7.asc 2024-04-03 01:58:16.335321542 +0200
339 @@ -1253,14 +1253,6 @@ CIO_IGNORE
340 rd.cio_accept=0.0.0180,0.0.0800,0.0.0801,0.0.0802
343 -Plymouth Boot Splash
344 -~~~~~~~~~~~~~~~~~~~~
345 -**plymouth.enable=0**::
346 - disable the plymouth bootsplash completely.
349 - disable the plymouth bootsplash only for the initramfs.
353 **masterkey=**__<kernel master key path name>__::
354 @@ -1408,8 +1400,6 @@ iscsi_in_password:: rd.iscsi.in.password
356 iscsi_firmware:: rd.iscsi.firmware=0
358 -rd_NO_PLYMOUTH:: rd.plymouth=0
363 diff -urpa dracut-059.orig/modules.d/01fips/fips.sh dracut-059/modules.d/01fips/fips.sh
364 --- dracut-059.orig/modules.d/01fips/fips.sh 2022-12-24 17:49:27.000000000 +0100
365 +++ dracut-059/modules.d/01fips/fips.sh 2024-04-03 01:34:16.263871644 +0200
366 @@ -4,15 +4,9 @@ type getarg > /dev/null 2>&1 || . /lib/d
368 # systemd lets stdout go to journal only, but the system
369 # has to halt when the integrity check fails to satisfy FIPS.
370 -if [ -z "$DRACUT_SYSTEMD" ]; then
385 diff -urpa dracut-059.orig/modules.d/02caps/module-setup.sh dracut-059/modules.d/02caps/module-setup.sh
386 --- dracut-059.orig/modules.d/02caps/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
387 +++ dracut-059/modules.d/02caps/module-setup.sh 2024-04-03 01:34:16.263871644 +0200
388 @@ -14,12 +14,8 @@ depends() {
392 - if ! dracut_module_included "systemd"; then
393 - inst_hook pre-pivot 00 "$moddir/caps.sh"
394 - inst "$(find_binary capsh 2> /dev/null)" /usr/sbin/capsh
395 - # capsh wants bash and we need bash also
398 - dwarning "caps: does not work with systemd in the initramfs"
400 + inst_hook pre-pivot 00 "$moddir/caps.sh"
401 + inst "$(find_binary capsh 2> /dev/null)" /usr/sbin/capsh
402 + # capsh wants bash and we need bash also
405 diff -urpa dracut-059.orig/modules.d/04watchdog/module-setup.sh dracut-059/modules.d/04watchdog/module-setup.sh
406 --- dracut-059.orig/modules.d/04watchdog/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
407 +++ dracut-059/modules.d/04watchdog/module-setup.sh 2024-04-03 01:34:16.263871644 +0200
408 @@ -15,20 +15,17 @@ depends() {
410 # Do not add watchdog hooks if systemd module is included
411 # In that case, systemd will manage watchdog kick
412 - if ! dracut_module_included "systemd"; then
413 - inst_hook cmdline 00 "$moddir/watchdog.sh"
414 - inst_hook cmdline 50 "$moddir/watchdog.sh"
415 - inst_hook pre-trigger 00 "$moddir/watchdog.sh"
416 - inst_hook initqueue 00 "$moddir/watchdog.sh"
417 - inst_hook mount 00 "$moddir/watchdog.sh"
418 - inst_hook mount 50 "$moddir/watchdog.sh"
419 - inst_hook mount 99 "$moddir/watchdog.sh"
420 - inst_hook pre-pivot 00 "$moddir/watchdog.sh"
421 - inst_hook pre-pivot 99 "$moddir/watchdog.sh"
422 - inst_hook cleanup 00 "$moddir/watchdog.sh"
423 - inst_hook cleanup 99 "$moddir/watchdog.sh"
426 + inst_hook cmdline 00 "$moddir/watchdog.sh"
427 + inst_hook cmdline 50 "$moddir/watchdog.sh"
428 + inst_hook pre-trigger 00 "$moddir/watchdog.sh"
429 + inst_hook initqueue 00 "$moddir/watchdog.sh"
430 + inst_hook mount 00 "$moddir/watchdog.sh"
431 + inst_hook mount 50 "$moddir/watchdog.sh"
432 + inst_hook mount 99 "$moddir/watchdog.sh"
433 + inst_hook pre-pivot 00 "$moddir/watchdog.sh"
434 + inst_hook pre-pivot 99 "$moddir/watchdog.sh"
435 + inst_hook cleanup 00 "$moddir/watchdog.sh"
436 + inst_hook cleanup 99 "$moddir/watchdog.sh"
437 inst_hook emergency 02 "$moddir/watchdog-stop.sh"
438 inst_multiple -o wdctl
440 diff -urpa dracut-059.orig/modules.d/10i18n/console_init.sh dracut-059/modules.d/10i18n/console_init.sh
441 --- dracut-059.orig/modules.d/10i18n/console_init.sh 2022-12-24 17:49:27.000000000 +0100
442 +++ dracut-059/modules.d/10i18n/console_init.sh 2024-04-03 01:34:16.263871644 +0200
446 -[ -n "$DRACUT_SYSTEMD" ] && exit 0
448 -if [ -x "$systemdutildir"/systemd-vconsole-setup ]; then
449 - "$systemdutildir"/systemd-vconsole-setup "$@"
452 [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
454 DEFAULT_FONT=eurlatgr
455 diff -urpa dracut-059.orig/modules.d/10i18n/module-setup.sh dracut-059/modules.d/10i18n/module-setup.sh
456 --- dracut-059.orig/modules.d/10i18n/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
457 +++ dracut-059/modules.d/10i18n/module-setup.sh 2024-04-03 01:34:16.263871644 +0200
458 @@ -18,13 +18,6 @@ depends() {
462 - if dracut_module_included "systemd"; then
465 - # shellcheck disable=SC1090
466 - [[ -f "$dracutsysrootdir"/etc/vconsole.conf ]] && . "$dracutsysrootdir"/etc/vconsole.conf
469 KBDSUBDIRS=(consolefonts consoletrans keymaps unimaps)
470 DEFAULT_FONT="${i18n_default_font:-eurlatgr}"
471 I18N_CONF="/etc/locale.conf"
472 @@ -122,11 +115,9 @@ install() {
474 inst_multiple setfont loadkeys kbd_mode stty
476 - if ! dracut_module_included "systemd"; then
477 - inst "${moddir}"/console_init.sh /lib/udev/console_init
478 - inst_rules "${moddir}"/10-console.rules
479 - inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
481 + inst "${moddir}"/console_init.sh /lib/udev/console_init
482 + inst_rules "${moddir}"/10-console.rules
483 + inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
485 if [[ ${kbddir} != "/usr/share" ]]; then
487 @@ -244,17 +235,11 @@ install() {
488 inst_simple "${kbddir}"/unimaps/"${FONT_UNIMAP}".uni
491 - if dracut_module_included "systemd" && [[ -f $dracutsysrootdir${I18N_CONF} ]]; then
492 - inst_simple ${I18N_CONF}
494 - mksubdirs "${initdir}"${I18N_CONF}
495 - print_vars LC_ALL LANG >> "${initdir}"${I18N_CONF}
497 + mksubdirs "${initdir}"${I18N_CONF}
498 + print_vars LC_ALL LANG >> "${initdir}"${I18N_CONF}
500 - if ! dracut_module_included "systemd"; then
501 - mksubdirs "${initdir}"${VCONFIG_CONF}
502 - print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> "${initdir}"${VCONFIG_CONF}
504 + mksubdirs "${initdir}"${VCONFIG_CONF}
505 + print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> "${initdir}"${VCONFIG_CONF}
509 @@ -283,11 +268,6 @@ install() {
513 - # https://github.com/dracutdevs/dracut/issues/796
514 - if dracut_module_included "systemd" && [[ -f $dracutsysrootdir${VCONFIG_CONF} ]]; then
515 - inst_simple ${VCONFIG_CONF}
518 if [[ ${hostonly} ]] && ! [[ ${i18n_install_all} == "yes" ]]; then
519 install_local_i18n || install_all_kbd
521 diff -urpa dracut-059.orig/modules.d/35network-legacy/module-setup.sh dracut-059/modules.d/35network-legacy/module-setup.sh
522 --- dracut-059.orig/modules.d/35network-legacy/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
523 +++ dracut-059/modules.d/35network-legacy/module-setup.sh 2024-04-03 01:50:09.792750224 +0200
524 @@ -22,12 +22,6 @@ installkernel() {
528 - #Adding default link
529 - if dracut_module_included "systemd"; then
530 - inst_multiple -o "${systemdnetwork}/99-default.link"
531 - [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link"
534 inst_multiple ip dhclient sed awk grep pgrep tr expr
536 inst_multiple -o arping arping2
537 diff -urpa dracut-059.orig/modules.d/35network-legacy/net-genrules.sh dracut-059/modules.d/35network-legacy/net-genrules.sh
538 --- dracut-059.orig/modules.d/35network-legacy/net-genrules.sh 2022-12-24 17:49:27.000000000 +0100
539 +++ dracut-059/modules.d/35network-legacy/net-genrules.sh 2024-04-03 01:34:19.367913571 +0200
540 @@ -102,11 +102,8 @@ command -v fix_bootif > /dev/null || . /
542 for iface in $IFACES; do
543 if [ "$bootdev" = "$iface" ] || [ "$NEEDNET" = "1" ]; then
544 - if [ -n "$netroot" ] && [ -n "$DRACUT_SYSTEMD" ]; then
545 - echo "systemctl is-active initrd-root-device.target || [ -f /tmp/net.${iface}.did-setup ]"
547 - echo "[ -f /tmp/net.${iface}.did-setup ]"
548 - fi > "$hookdir"/initqueue/finished/wait-"$iface".sh
549 + echo "[ -f /tmp/net.${iface}.did-setup ]"
550 + > "$hookdir"/initqueue/finished/wait-"$iface".sh
553 # Default: We don't know the interface to use, handle all
554 diff -urpa dracut-059.orig/modules.d/40network/module-setup.sh dracut-059/modules.d/40network/module-setup.sh
555 --- dracut-059.orig/modules.d/40network/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
556 +++ dracut-059/modules.d/40network/module-setup.sh 2024-04-03 01:44:08.395869097 +0200
557 @@ -9,27 +9,7 @@ check() {
559 is_qemu_virtualized && echo -n "qemu-net "
561 - for module in network-wicked connman network-manager network-legacy systemd-networkd; do
562 - if dracut_module_included "$module"; then
563 - network_handler="$module"
568 - if [ -z "$network_handler" ]; then
569 - if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
570 - network_handler="network-wicked"
571 - elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
572 - network_handler="connman"
573 - elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
574 - network_handler="network-manager"
575 - elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
576 - network_handler="systemd-networkd"
578 - network_handler="network-legacy"
581 - echo "kernel-network-modules $network_handler"
582 + echo "kernel-network-modules network-legacy"
586 diff -urpa dracut-059.orig/modules.d/40network/net-lib.sh dracut-059/modules.d/40network/net-lib.sh
587 --- dracut-059.orig/modules.d/40network/net-lib.sh 2022-12-24 17:49:27.000000000 +0100
588 +++ dracut-059/modules.d/40network/net-lib.sh 2024-04-03 01:34:19.367913571 +0200
589 @@ -59,7 +59,7 @@ iface_name() {
590 configured_ifaces() {
591 local IFACES="" iface_id="" rv=1
592 [ -e "/tmp/net.ifaces" ] && read -r IFACES < /tmp/net.ifaces
593 - if { pidof udevd || pidof systemd-udevd; } > /dev/null; then
594 + if { pidof udevd; } > /dev/null; then
595 for iface_id in $IFACES; do
596 printf "%s\n" "$(iface_name "$iface_id")"
598 diff -urpa dracut-059.orig/modules.d/50plymouth/module-setup.sh dracut-059/modules.d/50plymouth/module-setup.sh
599 --- dracut-059.orig/modules.d/50plymouth/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
600 +++ dracut-059/modules.d/50plymouth/module-setup.sh 2024-04-03 01:34:19.367913571 +0200
601 @@ -46,8 +46,6 @@ install() {
603 inst_multiple plymouthd plymouth plymouth-set-default-theme
605 - if ! dracut_module_included "systemd"; then
606 - inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
607 - inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
609 + inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
610 + inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
612 diff -urpa dracut-059.orig/modules.d/80test-root/module-setup.sh dracut-059/modules.d/80test-root/module-setup.sh
613 --- dracut-059.orig/modules.d/80test-root/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
614 +++ dracut-059/modules.d/80test-root/module-setup.sh 2024-04-03 01:57:03.802341909 +0200
615 @@ -22,6 +22,4 @@ install() {
616 inst_binary "${dracutbasedir}/dracut-util" "/usr/bin/dracut-util"
617 ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
618 ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
620 - inst_multiple -o plymouth
622 diff -urpa dracut-059.orig/modules.d/90btrfs/module-setup.sh dracut-059/modules.d/90btrfs/module-setup.sh
623 --- dracut-059.orig/modules.d/90btrfs/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
624 +++ dracut-059/modules.d/90btrfs/module-setup.sh 2024-04-03 01:34:19.367913571 +0200
625 @@ -43,9 +43,7 @@ install() {
626 inst_rules 64-btrfs-dm.rules
629 - if ! dracut_module_included "systemd"; then
630 - inst_hook initqueue/timeout 10 "$moddir/btrfs_timeout.sh"
632 + inst_hook initqueue/timeout 10 "$moddir/btrfs_timeout.sh"
634 inst_multiple -o btrfsck btrfs-zero-log
635 inst "$(command -v btrfs)" /sbin/btrfs
636 diff -urpa dracut-059.orig/modules.d/90crypt/crypt-lib.sh dracut-059/modules.d/90crypt/crypt-lib.sh
637 --- dracut-059.orig/modules.d/90crypt/crypt-lib.sh 2022-12-24 17:49:27.000000000 +0100
638 +++ dracut-059/modules.d/90crypt/crypt-lib.sh 2024-04-03 01:34:19.367913571 +0200
639 @@ -105,30 +105,22 @@ ask_for_password() {
643 - # Prompt for password with plymouth, if installed and running.
644 - if type plymouth > /dev/null 2>&1 && plymouth --ping 2> /dev/null; then
645 - plymouth ask-for-password \
646 - --prompt "$ply_prompt" --number-of-tries="$ply_tries" \
647 - --command="$ply_cmd"
650 - if [ "$tty_echo_off" = yes ]; then
651 - stty_orig="$(stty -g)"
654 + if [ "$tty_echo_off" = yes ]; then
655 + stty_orig="$(stty -g)"
660 - while [ $i -le "$tty_tries" ]; do
661 - [ -n "$tty_prompt" ] \
662 - && printf "%s" "$tty_prompt [$i/$tty_tries]:" >&2
663 - eval "$tty_cmd" && ret=0 && break
666 - [ -n "$tty_prompt" ] && printf '\n' >&2
669 + while [ $i -le "$tty_tries" ]; do
670 + [ -n "$tty_prompt" ] \
671 + && printf "%s" "$tty_prompt [$i/$tty_tries]:" >&2
672 + eval "$tty_cmd" && ret=0 && break
675 + [ -n "$tty_prompt" ] && printf '\n' >&2
678 - [ "$tty_echo_off" = yes ] && stty "$stty_orig"
680 + [ "$tty_echo_off" = yes ] && stty "$stty_orig"
683 [ $ret -ne 0 ] && echo "Wrong password" >&2
684 diff -urpa dracut-059.orig/modules.d/90crypt/crypt-run-generator.sh dracut-059/modules.d/90crypt/crypt-run-generator.sh
685 --- dracut-059.orig/modules.d/90crypt/crypt-run-generator.sh 2022-12-24 17:49:27.000000000 +0100
686 +++ dracut-059/modules.d/90crypt/crypt-run-generator.sh 2024-04-03 01:34:19.367913571 +0200
687 @@ -11,7 +11,7 @@ crypttab_contains "$luks" "$dev" && exit
690 # parse for allow-discards
691 -if [ -n "$DRACUT_SYSTEMD" ] || strstr "$(cryptsetup --help)" "allow-discards"; then
692 +if strstr "$(cryptsetup --help)" "allow-discards"; then
693 if discarduuids=$(getargs "rd.luks.allow-discards"); then
694 discarduuids=$(str_replace "$discarduuids" 'luks-' '')
695 if strstr " $discarduuids " " ${luks##luks-}"; then
698 echo "$luks $dev - timeout=0,$allowdiscards" >> /etc/crypttab
700 -if command -v systemctl > /dev/null; then
701 - systemctl daemon-reload
702 - systemctl start cryptsetup.target
705 diff -urpa dracut-059.orig/modules.d/90crypt/module-setup.sh dracut-059/modules.d/90crypt/module-setup.sh
706 --- dracut-059.orig/modules.d/90crypt/module-setup.sh 2024-04-03 01:32:59.746838184 +0200
707 +++ dracut-059/modules.d/90crypt/module-setup.sh 2024-04-03 01:34:19.367913571 +0200
711 # if cryptsetup is not installed, then we cannot support encrypted devices.
712 - require_any_binary "$systemdutildir"/systemd-cryptsetup cryptsetup || return 1
713 + require_any_binary cryptsetup || return 1
715 [[ $hostonly ]] || [[ $mount_needs ]] && {
716 for fs in "${host_fs_types[@]}"; do
717 @@ -20,17 +20,6 @@ check() {
720 deps="dm rootfs-block"
721 - if [[ $hostonly && -f "$dracutsysrootdir"/etc/crypttab ]]; then
722 - if grep -q -e "fido2-device=" -e "fido2-cid=" "$dracutsysrootdir"/etc/crypttab; then
725 - if grep -q "pkcs11-uri" "$dracutsysrootdir"/etc/crypttab; then
728 - if grep -q "tpm2-device=" "$dracutsysrootdir"/etc/crypttab; then
735 @@ -96,13 +85,11 @@ install() {
738 inst_hook cmdline 30 "$moddir/parse-crypt.sh"
739 - if ! dracut_module_included "systemd"; then
740 - inst_multiple cryptsetup rmdir readlink umount
741 - inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
742 - inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev
743 - inst_hook cmdline 10 "$moddir/parse-keydev.sh"
744 - inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
746 + inst_multiple cryptsetup rmdir readlink umount
747 + inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
748 + inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev
749 + inst_hook cmdline 10 "$moddir/parse-keydev.sh"
750 + inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
752 if [[ $hostonly ]] && [[ -f $dracutsysrootdir/etc/crypttab ]]; then
753 # filter /etc/crypttab for the devices we need
754 @@ -176,21 +163,5 @@ install() {
755 inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
756 inst_script "$moddir/crypt-run-generator.sh" "/sbin/crypt-run-generator"
758 - if dracut_module_included "systemd"; then
759 - # the cryptsetup targets are already pulled in by 00systemd, but not
760 - # the enablement symlinks
762 - "$tmpfilesdir"/cryptsetup.conf \
763 - "$systemdutildir"/system-generators/systemd-cryptsetup-generator \
764 - "$systemdutildir"/systemd-cryptsetup \
765 - "$systemdsystemunitdir"/systemd-ask-password-console.path \
766 - "$systemdsystemunitdir"/systemd-ask-password-console.service \
767 - "$systemdsystemunitdir"/cryptsetup.target \
768 - "$systemdsystemunitdir"/sysinit.target.wants/cryptsetup.target \
769 - "$systemdsystemunitdir"/remote-cryptsetup.target \
770 - "$systemdsystemunitdir"/initrd-root-device.target.wants/remote-cryptsetup.target \
771 - systemd-ask-password systemd-tty-ask-password-agent
774 dracut_need_initqueue
776 diff -urpa dracut-059.orig/modules.d/90crypt/parse-crypt.sh dracut-059/modules.d/90crypt/parse-crypt.sh
777 --- dracut-059.orig/modules.d/90crypt/parse-crypt.sh 2022-12-24 17:49:27.000000000 +0100
778 +++ dracut-059/modules.d/90crypt/parse-crypt.sh 2024-04-03 01:40:00.012514381 +0200
779 @@ -36,12 +36,6 @@ else
780 LUKS=$(getargs rd.luks.uuid -d rd_LUKS_UUID)
781 tout=$(getarg rd.luks.key.tout)
783 - if [ -e /etc/crypttab ]; then
784 - while read -r _ _dev _ || [ -n "$_dev" ]; do
785 - set_systemd_timeout_for_dev "$_dev"
786 - done < /etc/crypttab
789 if [ -n "$PARTUUID" ]; then
790 for uuid in $PARTUUID; do
792 @@ -58,28 +52,13 @@ else
793 luksname="luks-$uuid"
796 - if [ -z "$DRACUT_SYSTEMD" ]; then
798 - printf -- 'ENV{ID_PART_ENTRY_UUID}=="*%s*", ' "$uuid"
799 - printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
800 - printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
801 - # shellcheck disable=SC2016
802 - printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
803 - } >> /etc/udev/rules.d/70-luks.rules.new
805 - luksname=$(dev_unit_name "$luksname")
806 - # shellcheck disable=SC1003
807 - luksname="$(str_replace "$luksname" '\' '\\')"
809 - if ! crypttab_contains "$uuid"; then
811 - printf -- 'ENV{ID_PART_ENTRY_UUID}=="*%s*", ' "$uuid"
812 - printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
813 - printf -- '--name systemd-cryptsetup-%%k %s start ' "$(command -v systemctl)"
814 - printf -- 'systemd-cryptsetup@%s.service"\n' "$luksname"
815 - } >> /etc/udev/rules.d/70-luks.rules.new
819 + printf -- 'ENV{ID_PART_ENTRY_UUID}=="*%s*", ' "$uuid"
820 + printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
821 + printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
822 + # shellcheck disable=SC2016
823 + printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
824 + } >> /etc/udev/rules.d/70-luks.rules.new
827 elif [ -n "$SERIAL" ]; then
828 @@ -98,28 +77,13 @@ else
829 luksname="luks-$serialid"
832 - if [ -z "$DRACUT_SYSTEMD" ]; then
834 - printf -- 'ENV{ID_SERIAL_SHORT}=="*%s*", ' "$serialid"
835 - printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
836 - printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
837 - # shellcheck disable=SC2016
838 - printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
839 - } >> /etc/udev/rules.d/70-luks.rules.new
841 - luksname=$(dev_unit_name "$luksname")
842 - # shellcheck disable=SC1003
843 - luksname="$(str_replace "$luksname" '\' '\\')"
845 - if ! crypttab_contains "$serialid"; then
847 - printf -- 'ENV{ID_SERIAL_SHORT}=="*%s*", ' "$serialid"
848 - printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
849 - printf -- '--name systemd-cryptsetup-%%k %s start ' "$(command -v systemctl)"
850 - printf -- 'systemd-cryptsetup@%s.service"\n' "$luksname"
851 - } >> /etc/udev/rules.d/70-luks.rules.new
855 + printf -- 'ENV{ID_SERIAL_SHORT}=="*%s*", ' "$serialid"
856 + printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
857 + printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
858 + # shellcheck disable=SC2016
859 + printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
860 + } >> /etc/udev/rules.d/70-luks.rules.new
863 elif [ -n "$LUKS" ]; then
864 @@ -138,30 +102,14 @@ else
865 luksname="luks-$luksid"
868 - if [ -z "$DRACUT_SYSTEMD" ]; then
870 - printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
871 - printf -- 'ENV{ID_FS_UUID}=="*%s*", ' "$luksid"
872 - printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
873 - printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
874 - # shellcheck disable=SC2016
875 - printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
876 - } >> /etc/udev/rules.d/70-luks.rules.new
878 - luksname=$(dev_unit_name "$luksname")
879 - # shellcheck disable=SC1003
880 - luksname="$(str_replace "$luksname" '\' '\\')"
882 - if ! crypttab_contains "$luksid"; then
884 - printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
885 - printf -- 'ENV{ID_FS_UUID}=="*%s*", ' "$luksid"
886 - printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
887 - printf -- '--name systemd-cryptsetup-%%k %s start ' "$(command -v systemctl)"
888 - printf -- 'systemd-cryptsetup@%s.service"\n' "$luksname"
889 - } >> /etc/udev/rules.d/70-luks.rules.new
893 + printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
894 + printf -- 'ENV{ID_FS_UUID}=="*%s*", ' "$luksid"
895 + printf -- 'RUN+="%s --settled --unique --onetime ' "$(command -v initqueue)"
896 + printf -- '--name cryptroot-ask-%%k %s ' "$(command -v cryptroot-ask)"
897 + # shellcheck disable=SC2016
898 + printf -- '$env{DEVNAME} %s %s %s"\n' "$luksname" "$is_keysource" "$tout"
899 + } >> /etc/udev/rules.d/70-luks.rules.new
901 if [ $is_keysource -eq 0 ]; then
903 @@ -175,21 +123,12 @@ else
906 elif getargbool 0 rd.auto; then
907 - if [ -z "$DRACUT_SYSTEMD" ]; then
909 - printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
910 - printf -- '--unique --settled --onetime --name cryptroot-ask-%%k '
911 - # shellcheck disable=SC2016
912 - printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} 0 %s"\n' "$(command -v cryptroot-ask)" "$tout"
913 - } >> /etc/udev/rules.d/70-luks.rules.new
916 - printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
917 - printf -- '--unique --settled --onetime --name crypt-run-generator-%%k '
918 - # shellcheck disable=SC2016
919 - printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID}"\n' "$(command -v crypt-run-generator)"
920 - } >> /etc/udev/rules.d/70-luks.rules.new
923 + printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
924 + printf -- '--unique --settled --onetime --name crypt-run-generator-%%k '
925 + # shellcheck disable=SC2016
926 + printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID}"\n' "$(command -v crypt-run-generator)"
927 + } >> /etc/udev/rules.d/70-luks.rules.new
930 echo 'LABEL="luks_end"' >> /etc/udev/rules.d/70-luks.rules.new
931 diff -urpa dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh dracut-059/modules.d/90dmsquash-live/dmsquash-live-root.sh
932 --- dracut-059.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh 2022-12-24 17:49:27.000000000 +0100
933 +++ dracut-059/modules.d/90dmsquash-live/dmsquash-live-root.sh 2024-04-03 01:47:30.930604587 +0200
934 @@ -67,18 +67,11 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf"
936 getarg rd.live.check -d check || check=""
937 if [ -n "$check" ]; then
938 - type plymouth > /dev/null 2>&1 && plymouth --hide-splash
939 - if [ -n "$DRACUT_SYSTEMD" ]; then
940 - p=$(dev_unit_name "$check_dev")
941 - systemctl start checkisomd5@"${p}".service
943 - checkisomd5 --verbose "$check_dev"
945 + checkisomd5 --verbose "$check_dev"
946 if [ $? -eq 1 ]; then
947 die "CD check failed!"
950 - type plymouth > /dev/null 2>&1 && plymouth --show-splash
953 ln -s "$livedev" /run/initramfs/livedev
954 @@ -168,7 +161,6 @@ do_live_overlay() {
956 if [ -n "$overlayfs" ]; then
958 - [ -n "$DRACUT_SYSTEMD" ] && reloadsysrootmountunit=":>/xor_overlayfs;"
962 @@ -177,9 +169,6 @@ do_live_overlay() {
963 && [ -d /run/initramfs/overlayfs/ovlwork ]; then
964 ln -s /run/initramfs/overlayfs/overlayfs /run/overlayfs${readonly_overlay:+-r}
965 ln -s /run/initramfs/overlayfs/ovlwork /run/ovlwork${readonly_overlay:+-r}
966 - if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then
967 - reloadsysrootmountunit=":>/xor_overlayfs;"
972 @@ -188,9 +177,6 @@ do_live_overlay() {
973 && [ -d /run/initramfs/overlayfs$pathspec/../ovlwork ]; then
974 ln -s /run/initramfs/overlayfs$pathspec /run/overlayfs${readonly_overlay:+-r}
975 ln -s /run/initramfs/overlayfs$pathspec/../ovlwork /run/ovlwork${readonly_overlay:+-r}
976 - if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then
977 - reloadsysrootmountunit=":>/xor_overlayfs;"
982 @@ -201,7 +187,6 @@ do_live_overlay() {
983 die "OverlayFS is required but not available."
986 - [ -n "$DRACUT_SYSTEMD" ] && reloadsysrootmountunit=":>/xor_overlayfs;"
987 m='OverlayFS is not available; using temporary Device-mapper overlay.'
989 unset -v overlayfs setup
990 @@ -218,40 +203,13 @@ do_live_overlay() {
991 All root filesystem changes will be lost on shutdown.
992 Press [Enter] to continue.'
993 printf "\n\n\n\n%s\n\n\n" "${m}" > /dev/kmsg
994 - if [ -n "$DRACUT_SYSTEMD" ]; then
995 - if type plymouth > /dev/null 2>&1 && plymouth --ping; then
996 - if getargbool 0 rhgb || getargbool 0 splash; then
1009 - plymouth display-message --text="${m}"
1011 - plymouth ask-question --prompt="${m}" --command=true
1014 - m=">>>$(printf '%s' "$m" | tr -d '\n') <<<"
1015 - systemd-ask-password --timeout=0 "${m}"
1018 - type plymouth > /dev/null 2>&1 && plymouth --ping && plymouth --quit
1019 - printf '\n\n%s' "$m"
1022 + printf '\n\n%s' "$m"
1025 if [ -n "$overlayfs" ]; then
1026 if [ -n "$readonly_overlay" ] && ! [ -h /run/overlayfs-r ]; then
1027 info "No persistent overlay found."
1028 unset -v readonly_overlay
1029 - [ -n "$DRACUT_SYSTEMD" ] && reloadsysrootmountunit="${reloadsysrootmountunit}:>/xor_readonly;"
1032 dd if=/dev/null of=/overlay bs=1024 count=1 seek=$((overlay_size * 1024)) 2> /dev/null
1033 @@ -334,9 +292,6 @@ if [ -e "$SQUASHED" ]; then
1035 elif [ -d /run/initramfs/squashfs/proc ]; then
1037 - if [ -z "$overlayfs" ] && [ -n "$DRACUT_SYSTEMD" ]; then
1038 - reloadsysrootmountunit=":>/xor_overlayfs;"
1040 overlayfs="required"
1042 die "Failed to find a root filesystem in $SQUASHED."
1043 @@ -411,10 +366,8 @@ if [ -n "$overlayfs" ]; then
1044 ln -sf /run/initramfs/live /run/rootfsbase
1047 - if [ -z "$DRACUT_SYSTEMD" ]; then
1048 - [ -n "$ROOTFLAGS" ] && ROOTFLAGS="-o $ROOTFLAGS"
1049 - printf 'mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > "$hookdir"/mount/01-$$-live.sh
1051 + [ -n "$ROOTFLAGS" ] && ROOTFLAGS="-o $ROOTFLAGS"
1052 + printf 'mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > "$hookdir"/mount/01-$$-live.sh
1054 [ -e "$SQUASHED" ] && umount -l /run/initramfs/squashfs
1056 diff -urpa dracut-059.orig/modules.d/90dmsquash-live/module-setup.sh dracut-059/modules.d/90dmsquash-live/module-setup.sh
1057 --- dracut-059.orig/modules.d/90dmsquash-live/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1058 +++ dracut-059/modules.d/90dmsquash-live/module-setup.sh 2024-04-03 01:44:29.724157165 +0200
1059 @@ -31,9 +31,5 @@ install() {
1060 inst_hook pre-pivot 20 "$moddir/apply-live-updates.sh"
1061 inst_script "$moddir/dmsquash-live-root.sh" "/sbin/dmsquash-live-root"
1062 inst_script "$moddir/iso-scan.sh" "/sbin/iso-scan"
1063 - if dracut_module_included "systemd-initrd"; then
1064 - inst_script "$moddir/dmsquash-generator.sh" "$systemdutildir"/system-generators/dracut-dmsquash-generator
1065 - inst_simple "$moddir/checkisomd5@.service" "/etc/systemd/system/checkisomd5@.service"
1067 dracut_need_initqueue
1069 diff -urpa dracut-059.orig/modules.d/90kernel-modules/module-setup.sh dracut-059/modules.d/90kernel-modules/module-setup.sh
1070 --- dracut-059.orig/modules.d/90kernel-modules/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1071 +++ dracut-059/modules.d/90kernel-modules/module-setup.sh 2024-04-03 01:34:19.367913571 +0200
1072 @@ -144,9 +144,7 @@ install() {
1073 [[ -d /lib/modprobe.d ]] && inst_multiple -o "/lib/modprobe.d/*.conf"
1074 [[ -d /usr/lib/modprobe.d ]] && inst_multiple -o "/usr/lib/modprobe.d/*.conf"
1075 [[ $hostonly ]] && inst_multiple -H -o /etc/modprobe.d/*.conf /etc/modprobe.conf
1076 - if ! dracut_module_included "systemd"; then
1077 - inst_hook cmdline 01 "$moddir/parse-kernel.sh"
1079 + inst_hook cmdline 01 "$moddir/parse-kernel.sh"
1080 inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
1081 inst_multiple -o sysctl
1083 diff -urpa dracut-059.orig/modules.d/90livenet/module-setup.sh dracut-059/modules.d/90livenet/module-setup.sh
1084 --- dracut-059.orig/modules.d/90livenet/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1085 +++ dracut-059/modules.d/90livenet/module-setup.sh 2024-04-03 01:34:19.367913571 +0200
1086 @@ -17,8 +17,5 @@ install() {
1087 inst_hook cmdline 29 "$moddir/parse-livenet.sh"
1088 inst_hook initqueue/online 95 "$moddir/fetch-liveupdate.sh"
1089 inst_script "$moddir/livenetroot.sh" "/sbin/livenetroot"
1090 - if dracut_module_included "systemd-initrd"; then
1091 - inst_script "$moddir/livenet-generator.sh" "$systemdutildir"/system-generators/dracut-livenet-generator
1093 dracut_need_initqueue
1095 diff -urpa dracut-059.orig/modules.d/90mdraid/module-setup.sh dracut-059/modules.d/90mdraid/module-setup.sh
1096 --- dracut-059.orig/modules.d/90mdraid/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1097 +++ dracut-059/modules.d/90mdraid/module-setup.sh 2024-04-03 01:34:19.367913571 +0200
1098 @@ -121,20 +121,6 @@ install() {
1099 inst_hook shutdown 30 "$moddir/md-shutdown.sh"
1100 inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
1101 inst_script "$moddir/mdraid_start.sh" /sbin/mdraid_start
1102 - if dracut_module_included "systemd"; then
1103 - if [[ -e $dracutsysrootdir$systemdsystemunitdir/mdmon@.service ]]; then
1104 - inst_simple "$systemdsystemunitdir"/mdmon@.service
1106 - if [[ -e $dracutsysrootdir$systemdsystemunitdir/mdadm-last-resort@.service ]]; then
1107 - inst_simple "$systemdsystemunitdir"/mdadm-last-resort@.service
1109 - if [[ -e $dracutsysrootdir$systemdsystemunitdir/mdadm-last-resort@.timer ]]; then
1110 - inst_simple "$systemdsystemunitdir"/mdadm-last-resort@.timer
1112 - if [[ -e $dracutsysrootdir$systemdsystemunitdir/mdadm-grow-continue@.service ]]; then
1113 - inst_simple "$systemdsystemunitdir"/mdadm-grow-continue@.service
1116 inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
1117 dracut_need_initqueue
1119 diff -urpa dracut-059.orig/modules.d/90multipath/module-setup.sh dracut-059/modules.d/90multipath/module-setup.sh
1120 --- dracut-059.orig/modules.d/90multipath/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1121 +++ dracut-059/modules.d/90multipath/module-setup.sh 2024-04-03 01:39:20.659982879 +0200
1122 @@ -132,18 +132,8 @@ install() {
1123 [[ $_conf ]] && echo "$_conf" >> "${initdir}/etc/cmdline.d/90multipath.conf"
1126 - if dracut_module_included "systemd"; then
1127 - if mpathconf_installed; then
1128 - inst_simple "${moddir}/multipathd-configure.service" "${systemdsystemunitdir}/multipathd-configure.service"
1129 - $SYSTEMCTL -q --root "$initdir" enable multipathd-configure.service
1131 - inst_simple "${systemdsystemunitdir}/multipathd.socket"
1132 - inst_simple "${moddir}/multipathd.service" "${systemdsystemunitdir}/multipathd.service"
1133 - $SYSTEMCTL -q --root "$initdir" enable multipathd.service
1135 - inst_hook pre-trigger 02 "$moddir/multipathd.sh"
1136 - inst_hook cleanup 02 "$moddir/multipathd-stop.sh"
1138 + inst_hook pre-trigger 02 "$moddir/multipathd.sh"
1139 + inst_hook cleanup 02 "$moddir/multipathd-stop.sh"
1141 inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
1142 inst_hook shutdown 20 "$moddir/multipath-shutdown.sh"
1143 diff -urpa dracut-059.orig/modules.d/91zipl/install_zipl_cmdline.sh dracut-059/modules.d/91zipl/install_zipl_cmdline.sh
1144 --- dracut-059.orig/modules.d/91zipl/install_zipl_cmdline.sh 2022-12-24 17:49:27.000000000 +0100
1145 +++ dracut-059/modules.d/91zipl/install_zipl_cmdline.sh 2024-04-03 01:34:19.367913571 +0200
1146 @@ -30,10 +30,6 @@ fi
1150 -if [ -f /etc/cmdline.d/99zipl.conf ]; then
1151 - systemctl restart dracut-cmdline.service
1152 - systemctl restart systemd-udev-trigger.service
1154 : > /tmp/install.zipl.cmdline-done
1157 diff -urpa dracut-059.orig/modules.d/95debug/module-setup.sh dracut-059/modules.d/95debug/module-setup.sh
1158 --- dracut-059.orig/modules.d/95debug/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1159 +++ dracut-059/modules.d/95debug/module-setup.sh 2024-04-03 01:40:31.656941777 +0200
1160 @@ -15,7 +15,7 @@ depends() {
1162 inst_multiple -o ls ps grep more cat rm strace free showmount df du lsblk \
1163 ping netstat rpcinfo vi scp ping6 ssh find chroot \
1164 - tcpdump cp dd less hostname mkdir systemd-analyze \
1165 + tcpdump cp dd less hostname mkdir \
1166 fsck fsck.ext2 fsck.ext4 fsck.ext3 fsck.ext4dev fsck.f2fs fsck.vfat e2fsck
1168 grep '^tcpdump:' "$dracutsysrootdir"/etc/passwd 2> /dev/null >> "$initdir/etc/passwd"
1169 diff -urpa dracut-059.orig/modules.d/95fcoe/cleanup-fcoe.sh dracut-059/modules.d/95fcoe/cleanup-fcoe.sh
1170 --- dracut-059.orig/modules.d/95fcoe/cleanup-fcoe.sh 2022-12-24 17:49:27.000000000 +0100
1171 +++ dracut-059/modules.d/95fcoe/cleanup-fcoe.sh 2024-04-03 01:34:19.399914002 +0200
1172 @@ -6,10 +6,8 @@ if [ -e /var/run/lldpad.pid ]; then
1174 # with systemd version 230, this is not necessary anymore
1175 # systemd commit cacf980ed44a28e276a6cc7f8fc41f991e2ab354
1176 - if [ -z "$DRACUT_SYSTEMD" ]; then
1177 - # shellcheck disable=SC2174
1178 - mkdir -m 0755 -p /run/initramfs/state/dev/shm
1179 - cp /dev/shm/lldpad.state /run/initramfs/state/dev/shm/ > /dev/null 2>&1
1180 - echo "files /dev/shm/lldpad.state" >> /run/initramfs/rwtab
1182 + # shellcheck disable=SC2174
1183 + mkdir -m 0755 -p /run/initramfs/state/dev/shm
1184 + cp /dev/shm/lldpad.state /run/initramfs/state/dev/shm/ > /dev/null 2>&1
1185 + echo "files /dev/shm/lldpad.state" >> /run/initramfs/rwtab
1187 diff -urpa dracut-059.orig/modules.d/95fstab-sys/mount-sys.sh dracut-059/modules.d/95fstab-sys/mount-sys.sh
1188 --- dracut-059.orig/modules.d/95fstab-sys/mount-sys.sh 2022-12-24 17:49:27.000000000 +0100
1189 +++ dracut-059/modules.d/95fstab-sys/mount-sys.sh 2024-04-03 01:34:19.399914002 +0200
1190 @@ -27,9 +27,7 @@ fstab_mount() {
1192 # systemd will mount and run fsck from /etc/fstab and we don't want to
1193 # run into a race condition.
1194 -if [ -z "$DRACUT_SYSTEMD" ]; then
1195 - [ -f /etc/fstab ] && fstab_mount /etc/fstab
1197 +[ -f /etc/fstab ] && fstab_mount /etc/fstab
1199 # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
1200 if [ -f "$NEWROOT"/etc/fstab.sys ]; then
1201 diff -urpa dracut-059.orig/modules.d/95iscsi/cleanup-iscsi.sh dracut-059/modules.d/95iscsi/cleanup-iscsi.sh
1202 --- dracut-059.orig/modules.d/95iscsi/cleanup-iscsi.sh 2022-12-24 17:49:27.000000000 +0100
1203 +++ dracut-059/modules.d/95iscsi/cleanup-iscsi.sh 2024-04-03 01:34:19.399914002 +0200
1207 -if [ -z "${DRACUT_SYSTEMD}" ] && { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
1208 +if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
1211 diff -urpa dracut-059.orig/modules.d/95iscsi/iscsiroot.sh dracut-059/modules.d/95iscsi/iscsiroot.sh
1212 --- dracut-059.orig/modules.d/95iscsi/iscsiroot.sh 2022-12-24 17:49:27.000000000 +0100
1213 +++ dracut-059/modules.d/95iscsi/iscsiroot.sh 2024-04-03 01:34:19.399914002 +0200
1214 @@ -37,8 +37,7 @@ iroot=${iroot#:}
1215 modprobe crc32c 2> /dev/null
1217 # start iscsiuio if needed
1218 -if [ -z "${DRACUT_SYSTEMD}" ] \
1219 - && { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; } \
1220 +if { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; } \
1221 && ! [ -e /tmp/iscsiuio-started ]; then
1223 : > /tmp/iscsiuio-started
1224 @@ -150,11 +149,6 @@ handle_netroot() {
1226 ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
1227 : > /tmp/iscsi_set_initiator
1228 - if [ -n "$DRACUT_SYSTEMD" ]; then
1229 - systemctl try-restart iscsid
1230 - # FIXME: iscsid is not yet ready, when the service is :-/
1235 if [ -z "$iscsi_initiator" ]; then
1236 @@ -171,11 +165,6 @@ handle_netroot() {
1238 ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
1239 : > /tmp/iscsi_set_initiator
1240 - if [ -n "$DRACUT_SYSTEMD" ]; then
1241 - systemctl try-restart iscsid
1242 - # FIXME: iscsid is not yet ready, when the service is :-/
1247 if [ -z "$iscsi_target_port" ]; then
1248 @@ -195,17 +184,10 @@ handle_netroot() {
1249 if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then
1251 ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
1252 - if [ -n "$DRACUT_SYSTEMD" ]; then
1253 - systemctl try-restart iscsid
1254 - # FIXME: iscsid is not yet ready, when the service is :-/
1259 - if [ -z "$DRACUT_SYSTEMD" ]; then
1266 # FIXME $iscsi_protocol??
1268 @@ -217,8 +199,7 @@ handle_netroot() {
1269 wait_for_dev -n /dev/root
1271 # install mount script
1272 - [ -z "$DRACUT_SYSTEMD" ] \
1273 - && echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > "$hookdir"/mount/01-$$-iscsi.sh
1274 + echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > "$hookdir"/mount/01-$$-iscsi.sh
1277 if strglobin "$iscsi_target_ip" '*:*:*' && ! strglobin "$iscsi_target_ip" '['; then
1278 diff -urpa dracut-059.orig/modules.d/95iscsi/module-setup.sh dracut-059/modules.d/95iscsi/module-setup.sh
1279 --- dracut-059.orig/modules.d/95iscsi/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1280 +++ dracut-059/modules.d/95iscsi/module-setup.sh 2024-04-03 01:34:19.399914002 +0200
1281 @@ -190,14 +190,6 @@ install() {
1282 inst_multiple umount iscsi-iname iscsiadm iscsid
1285 - inst_multiple -o \
1286 - "$systemdsystemunitdir"/iscsid.socket \
1287 - "$systemdsystemunitdir"/iscsid.service \
1288 - "$systemdsystemunitdir"/iscsiuio.service \
1289 - "$systemdsystemunitdir"/iscsiuio.socket \
1290 - "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket \
1291 - "$systemdsystemunitdir"/sockets.target.wants/iscsiuio.socket
1293 if [[ $hostonly ]]; then
1296 @@ -218,74 +210,7 @@ install() {
1297 inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
1298 inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
1299 inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
1301 - if ! dracut_module_included "systemd"; then
1302 - inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
1304 - inst_multiple -o \
1305 - "$systemdsystemunitdir"/iscsi.service \
1306 - "$systemdsystemunitdir"/iscsi-init.service \
1307 - "$systemdsystemunitdir"/iscsid.service \
1308 - "$systemdsystemunitdir"/iscsid.socket \
1309 - "$systemdsystemunitdir"/iscsiuio.service \
1310 - "$systemdsystemunitdir"/iscsiuio.socket \
1315 - iscsiuio.socket; do
1316 - $SYSTEMCTL -q --root "$initdir" enable "$i"
1319 - mkdir -p "${initdir}/$systemdsystemunitdir/iscsid.service.d"
1322 - echo "DefaultDependencies=no"
1323 - echo "Conflicts=shutdown.target"
1324 - echo "Before=shutdown.target"
1325 - } > "${initdir}/$systemdsystemunitdir/iscsid.service.d/dracut.conf"
1327 - mkdir -p "${initdir}/$systemdsystemunitdir/iscsid.socket.d"
1330 - echo "DefaultDependencies=no"
1331 - echo "Conflicts=shutdown.target"
1332 - echo "Before=shutdown.target sockets.target"
1333 - } > "${initdir}/$systemdsystemunitdir/iscsid.socket.d/dracut.conf"
1335 - mkdir -p "${initdir}/$systemdsystemunitdir/iscsiuio.service.d"
1338 - echo "DefaultDependencies=no"
1339 - echo "Conflicts=shutdown.target"
1340 - echo "Before=shutdown.target"
1341 - } > "${initdir}/$systemdsystemunitdir/iscsiuio.service.d/dracut.conf"
1343 - mkdir -p "${initdir}/$systemdsystemunitdir/iscsiuio.socket.d"
1346 - echo "DefaultDependencies=no"
1347 - echo "Conflicts=shutdown.target"
1348 - echo "Before=shutdown.target sockets.target"
1349 - } > "${initdir}/$systemdsystemunitdir/iscsiuio.socket.d/dracut.conf"
1351 - # Fedora 34 iscsid requires iscsi-shutdown.service
1352 - # which would terminate all iSCSI connections on switch root
1353 - cat > "${initdir}/$systemdsystemunitdir/iscsi-shutdown.service" << EOF
1355 -Description=Dummy iscsi-shutdown.service for the initrd
1356 -Documentation=man:iscsid(8) man:iscsiadm(8)
1357 -DefaultDependencies=no
1358 -Conflicts=shutdown.target
1359 -After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
1360 -Before=remote-fs-pre.target
1364 -RemainAfterExit=false
1365 -ExecStart=-/usr/bin/true
1368 + inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
1369 inst_dir /var/lib/iscsi
1370 mkdir -p "${initdir}/var/lib/iscsi/nodes"
1371 # Fedora 34 iscsid wants a non-empty /var/lib/iscsi/nodes directory
1372 diff -urpa dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh dracut-059/modules.d/95iscsi/parse-iscsiroot.sh
1373 --- dracut-059.orig/modules.d/95iscsi/parse-iscsiroot.sh 2022-12-24 17:49:27.000000000 +0100
1374 +++ dracut-059/modules.d/95iscsi/parse-iscsiroot.sh 2024-04-03 01:34:19.399914002 +0200
1375 @@ -41,7 +41,6 @@ if [ "${root%%:*}" = "iscsi" ]; then
1377 # if root is not specified try to mount the whole iSCSI LUN
1378 printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
1379 - [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
1382 write_fs_tab /dev/root
1383 @@ -58,7 +57,6 @@ done
1384 if [ "${root}" = "/dev/root" ] && getarg "netroot=dhcp"; then
1385 # if root is not specified try to mount the whole iSCSI LUN
1386 printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
1387 - [ -n "$DRACUT_SYSTEMD" ] && systemctl is-active systemd-udevd && udevadm control --reload-rules
1390 if [ -n "$iscsiroot" ]; then
1391 @@ -84,7 +82,7 @@ if [ -n "$iscsi_firmware" ]; then
1392 modprobe -b -q iscsi_boot_sysfs 2> /dev/null
1393 modprobe -b -q iscsi_ibft
1394 # if no ip= is given, but firmware
1395 - echo "${DRACUT_SYSTEMD+systemctl is-active initrd-root-device.target || }[ -f '/tmp/iscsistarted-firmware' ]" > "$hookdir"/initqueue/finished/iscsi_started.sh
1396 + echo "[ -f '/tmp/iscsistarted-firmware' ]" > "$hookdir"/initqueue/finished/iscsi_started.sh
1397 initqueue --unique --online /sbin/iscsiroot online "iscsi:" "$NEWROOT"
1398 initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "iscsi:" "$NEWROOT"
1399 initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
1400 @@ -110,11 +108,6 @@ if arg=$(getarg rd.iscsi.initiator -d is
1401 rm -f /etc/iscsi/initiatorname.iscsi
1403 ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
1404 - if [ -n "$DRACUT_SYSTEMD" ]; then
1405 - systemctl try-restart iscsid
1406 - # FIXME: iscsid is not yet ready, when the service is :-/
1411 # If not given on the cmdline and initiator-name available via iBFT
1412 @@ -126,11 +119,6 @@ if [ -z "$iscsi_initiator" ] && [ -f /sy
1414 ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
1415 : > /tmp/iscsi_set_initiator
1416 - if [ -n "$DRACUT_SYSTEMD" ]; then
1417 - systemctl try-restart iscsid
1418 - # FIXME: iscsid is not yet ready, when the service is :-/
1424 @@ -145,7 +133,7 @@ for nroot in $(getargs netroot); do
1425 type parse_iscsi_root > /dev/null 2>&1 || . /lib/net-lib.sh
1426 parse_iscsi_root "$nroot" || return 1
1427 netroot_enc=$(str_replace "$nroot" '/' '\2f')
1428 - echo "${DRACUT_SYSTEMD+systemctl is-active initrd-root-device.target || }[ -f '/tmp/iscsistarted-$netroot_enc' ]" > "$hookdir"/initqueue/finished/iscsi_started.sh
1429 + echo "[ -f '/tmp/iscsistarted-$netroot_enc' ]" > "$hookdir"/initqueue/finished/iscsi_started.sh
1433 diff -urpa dracut-059.orig/modules.d/95nbd/module-setup.sh dracut-059/modules.d/95nbd/module-setup.sh
1434 --- dracut-059.orig/modules.d/95nbd/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1435 +++ dracut-059/modules.d/95nbd/module-setup.sh 2024-04-03 01:34:19.399914002 +0200
1436 @@ -32,8 +32,5 @@ install() {
1438 inst_hook cmdline 90 "$moddir/parse-nbdroot.sh"
1439 inst_script "$moddir/nbdroot.sh" "/sbin/nbdroot"
1440 - if dracut_module_included "systemd-initrd"; then
1441 - inst_script "$moddir/nbd-generator.sh" "$systemdutildir"/system-generators/dracut-nbd-generator
1443 dracut_need_initqueue
1445 diff -urpa dracut-059.orig/modules.d/95nbd/nbdroot.sh dracut-059/modules.d/95nbd/nbdroot.sh
1446 --- dracut-059.orig/modules.d/95nbd/nbdroot.sh 2022-12-24 17:49:27.000000000 +0100
1447 +++ dracut-059/modules.d/95nbd/nbdroot.sh 2024-04-03 01:34:19.399914002 +0200
1448 @@ -101,27 +101,13 @@ if [ "$root" = "block:/dev/root" -o "$ro
1449 udevadm control --reload
1450 wait_for_dev -n /dev/root
1452 - if [ -z "$DRACUT_SYSTEMD" ]; then
1453 - type write_fs_tab > /dev/null 2>&1 || . /lib/fs-lib.sh
1454 + type write_fs_tab > /dev/null 2>&1 || . /lib/fs-lib.sh
1456 - write_fs_tab /dev/root "$nbdfstype" "$fsopts"
1457 + write_fs_tab /dev/root "$nbdfstype" "$fsopts"
1459 - printf '/bin/mount %s\n' \
1461 - > "$hookdir"/mount/01-$$-nbd.sh
1463 - mkdir -p /run/systemd/system/sysroot.mount.d
1464 - cat << EOF > /run/systemd/system/sysroot.mount.d/dhcp.conf
1471 - systemctl --no-block daemon-reload
1473 - # if we're on systemd, use the nbd-generator script
1474 - # to create the /sysroot mount.
1475 + printf '/bin/mount %s\n' \
1477 + > "$hookdir"/mount/01-$$-nbd.sh
1480 if ! [ "$nbdport" -gt 0 ] 2> /dev/null; then
1481 diff -urpa dracut-059.orig/modules.d/95resume/module-setup.sh dracut-059/modules.d/95resume/module-setup.sh
1482 --- dracut-059.orig/modules.d/95resume/module-setup.sh 2024-04-03 01:28:29.775191905 +0200
1483 +++ dracut-059/modules.d/95resume/module-setup.sh 2024-04-03 01:34:19.399914002 +0200
1484 @@ -40,15 +40,6 @@ install() {
1485 [[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/95resume.conf"
1488 - # if systemd is included and has the hibernate-resume tool, use it and nothing else
1489 - if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
1490 - inst_multiple -o \
1491 - "$systemdutildir"/system-generators/systemd-hibernate-resume-generator \
1492 - "$systemdsystemunitdir"/systemd-hibernate-resume@.service \
1493 - "$systemdutildir"/systemd-hibernate-resume
1497 # Optional uswsusp support
1498 for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume; do
1499 [[ -x $dracutsysrootdir${_bin} ]] && {
1500 @@ -58,11 +49,7 @@ install() {
1504 - if ! dracut_module_included "systemd"; then
1505 - inst_hook cmdline 10 "$moddir/parse-resume.sh"
1507 - inst_script "$moddir/parse-resume.sh" /lib/dracut/parse-resume.sh
1509 + inst_hook cmdline 10 "$moddir/parse-resume.sh"
1511 inst_script "$moddir/resume.sh" /lib/dracut/resume.sh
1513 diff -urpa dracut-059.orig/modules.d/95rootfs-block/module-setup.sh dracut-059/modules.d/95rootfs-block/module-setup.sh
1514 --- dracut-059.orig/modules.d/95rootfs-block/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1515 +++ dracut-059/modules.d/95rootfs-block/module-setup.sh 2024-04-03 01:34:19.399914002 +0200
1516 @@ -82,11 +82,9 @@ install() {
1518 inst_multiple umount
1520 - if ! dracut_module_included "systemd"; then
1521 - inst_hook cmdline 95 "$moddir/parse-block.sh"
1522 - inst_hook pre-udev 30 "$moddir/block-genrules.sh"
1523 - inst_hook mount 99 "$moddir/mount-root.sh"
1525 + inst_hook cmdline 95 "$moddir/parse-block.sh"
1526 + inst_hook pre-udev 30 "$moddir/block-genrules.sh"
1527 + inst_hook mount 99 "$moddir/mount-root.sh"
1529 inst_hook initqueue/timeout 99 "$moddir/rootfallback.sh"
1531 diff -urpa dracut-059.orig/modules.d/95udev-rules/module-setup.sh dracut-059/modules.d/95udev-rules/module-setup.sh
1532 --- dracut-059.orig/modules.d/95udev-rules/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1533 +++ dracut-059/modules.d/95udev-rules/module-setup.sh 2024-04-03 01:34:19.399914002 +0200
1534 @@ -11,18 +11,13 @@ install() {
1536 inst_multiple -o /etc/udev/udev.conf
1538 - [[ -d ${initdir}/$systemdutildir ]] || mkdir -p "${initdir}/$systemdutildir"
1539 - for _i in "${systemdutildir}"/systemd-udevd "${udevdir}"/udevd /sbin/udevd; do
1540 + for _i in /sbin/udevd; do
1541 [[ -x $dracutsysrootdir$_i ]] || continue
1544 - if ! [[ -f ${initdir}${systemdutildir}/systemd-udevd ]]; then
1545 - ln -fs "$_i" "${initdir}${systemdutildir}"/systemd-udevd
1549 - if ! [[ -e ${initdir}${systemdutildir}/systemd-udevd ]]; then
1550 - derror "Cannot find [systemd-]udevd binary!"
1551 + if ! [[ -e /sbin/udevd ]]; then
1552 + derror "Cannot find udevd binary!"
1556 diff -urpa dracut-059.orig/modules.d/98usrmount/module-setup.sh dracut-059/modules.d/98usrmount/module-setup.sh
1557 --- dracut-059.orig/modules.d/98usrmount/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
1558 +++ dracut-059/modules.d/98usrmount/module-setup.sh 2024-04-03 01:34:19.399914002 +0200
1559 @@ -13,8 +13,6 @@ depends() {
1563 - if ! dracut_module_included "systemd"; then
1564 - inst_hook pre-pivot 50 "$moddir/mount-usr.sh"
1566 + inst_hook pre-pivot 50 "$moddir/mount-usr.sh"
1569 diff -urpa dracut-059.orig/modules.d/99base/dracut-dev-lib.sh dracut-059/modules.d/99base/dracut-dev-lib.sh
1570 --- dracut-059.orig/modules.d/99base/dracut-dev-lib.sh 2022-12-24 17:49:27.000000000 +0100
1571 +++ dracut-059/modules.d/99base/dracut-dev-lib.sh 2024-04-03 01:34:19.399914002 +0200
1572 @@ -25,11 +25,6 @@ str_replace() {
1576 - if command -v systemd-escape > /dev/null; then
1577 - systemd-escape -p -- "$dev"
1581 if [ "$dev" = "/" -o -z "$dev" ]; then
1584 @@ -48,53 +43,6 @@ dev_unit_name() {
1585 printf -- "%s" "$dev"
1588 -# set_systemd_timeout_for_dev [-n] <dev> [<timeout>]
1589 -# Set 'rd.timeout' as the systemd timeout for <dev>
1590 -set_systemd_timeout_for_dev() {
1596 - [ -z "$DRACUT_SYSTEMD" ] && return 0
1598 - if [ "$1" = "-n" ]; then
1603 - if [ -n "$2" ]; then
1606 - _timeout=$(getarg rd.timeout)
1609 - _timeout=${_timeout:-0}
1611 - _name=$(dev_unit_name "$1")
1612 - if ! [ -L "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device" ]; then
1613 - [ -d "${PREFIX}"/etc/systemd/system/initrd.target.wants ] || mkdir -p "${PREFIX}"/etc/systemd/system/initrd.target.wants
1614 - ln -s ../"${_name}".device "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device"
1615 - type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/initrd.target.wants/"${_name}".device
1619 - if ! [ -f "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf" ]; then
1620 - mkdir -p "${PREFIX}/etc/systemd/system/${_name}.device.d"
1623 - echo "JobTimeoutSec=$_timeout"
1624 - echo "JobRunningTimeoutSec=$_timeout"
1625 - } > "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf"
1626 - type mark_hostonly > /dev/null 2>&1 && mark_hostonly /etc/systemd/system/"${_name}".device.d/timeout.conf
1630 - if [ -z "$PREFIX" ] && [ "$_needreload" = 1 ] && [ -z "$_noreload" ]; then
1631 - /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
1635 # wait_for_dev <dev> [<timeout>]
1637 # Installs a initqueue-finished script,
1638 @@ -122,7 +70,6 @@ wait_for_dev() {
1639 printf 'warn "\"%s\" does not exist"\n' "$1"
1640 } >> "${PREFIX}$hookdir/emergency/80-${_name}.sh"
1642 - set_systemd_timeout_for_dev $_noreload "$@"
1645 cancel_wait_for_dev() {
1646 @@ -130,10 +77,4 @@ cancel_wait_for_dev() {
1647 _name="$(str_replace "$1" '/' '\x2f')"
1648 rm -f -- "$hookdir/initqueue/finished/devexists-${_name}.sh"
1649 rm -f -- "$hookdir/emergency/80-${_name}.sh"
1650 - if [ -n "$DRACUT_SYSTEMD" ]; then
1651 - _name=$(dev_unit_name "$1")
1652 - rm -f -- "${PREFIX}/etc/systemd/system/initrd.target.wants/${_name}.device"
1653 - rm -f -- "${PREFIX}/etc/systemd/system/${_name}.device.d/timeout.conf"
1654 - /sbin/initqueue --onetime --unique --name daemon-reload systemctl daemon-reload
1657 diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/99base/dracut-lib.sh
1658 --- dracut-059.orig/modules.d/99base/dracut-lib.sh 2024-04-03 01:31:54.785960810 +0200
1659 +++ dracut-059/modules.d/99base/dracut-lib.sh 2024-04-03 01:49:20.168079971 +0200
1662 type wait_for_dev > /dev/null 2>&1 || . /lib/dracut-dev-lib.sh
1664 -export DRACUT_SYSTEMD
1666 if [ -n "$NEWROOT" ]; then
1667 [ -d "$NEWROOT" ] || mkdir -p -m 0755 "$NEWROOT"
1668 @@ -63,33 +62,19 @@ trim() {
1672 -if [ -z "$DRACUT_SYSTEMD" ]; then
1676 - echo "<28>dracut Warning: $*" > /dev/kmsg
1677 - echo "dracut Warning: $*" >&2
1682 - echo "<30>dracut: $*" > /dev/kmsg
1683 - if [ "$DRACUT_QUIET" != "yes" ]; then
1684 - echo "dracut: $*" >&2
1691 - echo "Warning: $*" >&2
1699 + echo "<28>dracut Warning: $*" > /dev/kmsg
1700 + echo "dracut Warning: $*" >&2
1706 + echo "<30>dracut: $*" > /dev/kmsg
1707 + if [ "$DRACUT_QUIET" != "yes" ]; then
1708 + echo "dracut: $*" >&2
1713 while read -r line || [ -n "$line" ]; do
1714 @@ -444,10 +429,6 @@ die() {
1715 source_hook "shutdown-emergency"
1718 - if [ -n "$DRACUT_SYSTEMD" ]; then
1719 - systemctl --no-block --force halt
1725 @@ -904,43 +885,35 @@ fi
1727 _emergency_shell() {
1729 - if [ -n "$DRACUT_SYSTEMD" ]; then
1730 - : > /.console_lock
1731 - echo "PS1=\"$_name:\\\${PWD}# \"" > /etc/profile
1732 - systemctl start dracut-emergency.service
1733 - rm -f -- /etc/profile
1734 - rm -f -- /.console_lock
1737 - source_hook "$hook"
1740 - echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
1741 - echo 'after mounting them and attach it to a bug report.'
1742 - if ! RD_DEBUG='' getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
1744 - echo 'To get more debug information in the report,'
1745 - echo 'reboot with "rd.debug" added to the kernel command line.'
1748 - echo 'Dropping to debug shell.'
1750 + source_hook "$hook"
1753 + echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
1754 + echo 'after mounting them and attach it to a bug report.'
1755 + if ! RD_DEBUG='' getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
1757 - export PS1="$_name:\${PWD}# "
1758 - [ -e /.profile ] || : > /.profile
1760 - _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
1761 - if [ -z "$_ctty" ]; then
1763 - while [ -f /sys/class/tty/$_ctty/active ]; do
1764 - read -r _ctty < /sys/class/tty/$_ctty/active
1765 - _ctty=${_ctty##* } # last one in the list
1769 - [ -c "$_ctty" ] || _ctty=/dev/tty1
1770 - case "$(/usr/bin/setsid --help 2>&1)" in *--ctty*) CTTY="--ctty" ;; esac
1771 - setsid $CTTY /bin/sh -i -l 0<> $_ctty 1<> $_ctty 2<> $_ctty
1772 + echo 'To get more debug information in the report,'
1773 + echo 'reboot with "rd.debug" added to the kernel command line.'
1776 + echo 'Dropping to debug shell.'
1778 + export PS1="$_name:\${PWD}# "
1779 + [ -e /.profile ] || : > /.profile
1781 + _ctty="$(RD_DEBUG='' getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
1782 + if [ -z "$_ctty" ]; then
1784 + while [ -f /sys/class/tty/$_ctty/active ]; do
1785 + read -r _ctty < /sys/class/tty/$_ctty/active
1786 + _ctty=${_ctty##* } # last one in the list
1790 + [ -c "$_ctty" ] || _ctty=/dev/tty1
1791 + case "$(/usr/bin/setsid --help 2>&1)" in *--ctty*) CTTY="--ctty" ;; esac
1792 + setsid $CTTY /bin/sh -i -l 0<> $_ctty 1<> $_ctty 2<> $_ctty
1796 diff -urpa dracut-059.orig/modules.d/99base/init.sh dracut-059/modules.d/99base/init.sh
1797 --- dracut-059.orig/modules.d/99base/init.sh 2024-04-03 01:31:54.785960810 +0200
1798 +++ dracut-059/modules.d/99base/init.sh 2024-04-03 01:34:19.399914002 +0200
1799 @@ -141,7 +141,7 @@ getargbool 0 rd.udev.info -d -y rdudevin
1800 getargbool 0 rd.udev.debug -d -y rdudevdebug && UDEV_LOG=debug
1802 # start up udev and trigger cold plugs
1803 -UDEV_LOG=$UDEV_LOG "$systemdutildir"/systemd-udevd --daemon --resolve-names=never
1804 +UDEV_LOG=$UDEV_LOG /sbin/udevd --daemon --resolve-names=never
1806 UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"
1808 diff -urpa dracut-059.orig/modules.d/99base/module-setup.sh dracut-059/modules.d/99base/module-setup.sh
1809 --- dracut-059.orig/modules.d/99base/module-setup.sh 2024-04-03 01:31:54.785960810 +0200
1810 +++ dracut-059/modules.d/99base/module-setup.sh 2024-04-03 01:48:14.915198647 +0200
1811 @@ -53,10 +53,8 @@ install() {
1812 inst_simple "$moddir/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
1813 mkdir -p "${initdir}"/var
1815 - if ! dracut_module_included "systemd"; then
1816 - inst_multiple switch_root || dfatal "Failed to install switch_root"
1817 - inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
1819 + inst_multiple switch_root || dfatal "Failed to install switch_root"
1820 + inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
1822 if [[ $realinitpath ]]; then
1823 for i in $realinitpath; do
1824 @@ -108,11 +106,8 @@ install() {
1825 if [[ -n ${host_devs[*]} ]]; then
1826 dracut_need_initqueue
1828 - if [[ -f $initdir/lib/dracut/need-initqueue ]] || ! dracut_module_included "systemd"; then
1829 + if [[ -f $initdir/lib/dracut/need-initqueue ]]; then
1831 - if dracut_module_included "systemd"; then
1832 - export DRACUT_SYSTEMD=1
1834 export PREFIX="$initdir"
1835 export hookdir=/lib/dracut/hooks
1837 diff -urpa dracut-059.orig/modules.d/99shutdown/shutdown.sh dracut-059/modules.d/99shutdown/shutdown.sh
1838 --- dracut-059.orig/modules.d/99shutdown/shutdown.sh 2022-12-24 17:49:27.000000000 +0100
1839 +++ dracut-059/modules.d/99shutdown/shutdown.sh 2024-04-03 01:56:30.249888736 +0200
1840 @@ -149,12 +149,6 @@ while [ $_cnt -le 40 ]; do
1842 [ $_cnt -ge 40 ] && _check_shutdown final
1844 -if type plymouth > /dev/null 2>&1; then
1845 - plymouth --hide-splash
1846 -elif [ -x /oldroot/bin/plymouth ]; then
1847 - /oldroot/bin/plymouth --hide-splash
1850 getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"