[packages/dracut] - started update to 106
baggins
baggins at pld-linux.org
Fri Feb 21 13:20:27 CET 2025
commit 1fb5cd69a18ef6ab39b49587829ef661849e2b57
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Feb 20 01:04:29 2025 +0100
- started update to 106
bash.patch | 11 ++-
convertfs-libx32.patch | 74 ++++++++++++++++++
dracut.spec | 77 ++++++++++---------
no-usr.patch | 201 +++++++++++++++++++++++++++++++++++++++++++++++++
plymouth-libdir.patch | 14 ++--
systemd-paths.patch | 11 ---
6 files changed, 331 insertions(+), 57 deletions(-)
---
diff --git a/dracut.spec b/dracut.spec
index 3bd0118..5b7f57a 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,18 +1,19 @@
Summary: Initramfs generator using udev
Summary(pl.UTF-8): Generator initramfs wykorzystujący udev
Name: dracut
-Version: 103
-Release: 1
+Version: 106
+Release: 0.1
License: GPL v2+
Group: Base
Source0: https://github.com/dracut-ng/dracut-ng/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 0fad536babb3cb764eaa8f3fc7eadba4
+# Source0-md5: f84b20c030178b4a28d2a194701f50cf
Source1: pld.conf
Patch0: plymouth-libdir.patch
Patch2: arch-libdir.patch
-Patch3: systemd-paths.patch
+Patch3: no-usr.patch
Patch4: cryptsetup.patch
Patch5: bash.patch
+Patch6: convertfs-libx32.patch
URL: https://github.com/dracut-ng/dracut-ng/wiki
BuildRequires: asciidoc
BuildRequires: dash
@@ -179,13 +180,21 @@ Bashowe dopełnianie składni dla polecenia dracut.
%prep
%setup -q -n dracut-ng-%{version}
-%patch0 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch -P 0 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
+%patch -P 6 -p1
-%{__sed} -i -e 's, at libexecdir@,%{_libexecdir},g' modules.d/50plymouth/module-setup.sh
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
+ test/*/*.sh \
+ test/run-qemu \
+ test/test-functions
+
+
+%{__sed} -i -e 's, at libexecdir@,%{_libexecdir},g' modules.d/45plymouth/module-setup.sh
%{__sed} -i -e 's, at lib@,%{_lib},g' modules.d/95resume/module-setup.sh
find modules.d -name '*.orig' | xargs -r %{__rm}
@@ -208,7 +217,7 @@ install -d $RPM_BUILD_ROOT{/boot/dracut,/sbin} \
DESTDIR=$RPM_BUILD_ROOT
install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
-install -p dracut.conf.d/50-fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf
+install -p dracut.conf.d/fips/50-fips.conf $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/50-fips.conf
echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT%{dracutlibdir}/dracut-version.sh
@@ -228,7 +237,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS NEWS.md README.md docs/HACKING.md dracut.html docs/dracut.png docs/dracut.svg
+%doc AUTHORS NEWS.md README.md
%dir %{_sysconfdir}/dracut.conf.d
%config(noreplace) %{_sysconfdir}/dracut.conf
%config(noreplace) %{_sysconfdir}/dracut.conf.d/01-dist.conf
@@ -250,8 +259,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dracutlibdir}/modules.d/00bash/module-setup.sh
%dir %{dracutlibdir}/modules.d/00dash
%attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
-%dir %{dracutlibdir}/modules.d/00mksh
-%attr(755,root,root) %{dracutlibdir}/modules.d/00mksh/module-setup.sh
+#%dir %{dracutlibdir}/modules.d/00mksh
+#%attr(755,root,root) %{dracutlibdir}/modules.d/00mksh/module-setup.sh
%dir %{dracutlibdir}/modules.d/00systemd
%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd/module-setup.sh
%dir %{dracutlibdir}/modules.d/00warpclock
@@ -297,9 +306,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-sysctl/module-setup.sh
%dir %{dracutlibdir}/modules.d/01systemd-sysext
%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-sysext/module-setup.sh
-%dir %{dracutlibdir}/modules.d/01systemd-sysusers
-%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-sysusers/module-setup.sh
-%{dracutlibdir}/modules.d/01systemd-sysusers/sysusers-dracut.conf
+#%dir %{dracutlibdir}/modules.d/01systemd-sysusers
+#%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-sysusers/module-setup.sh
+#%{dracutlibdir}/modules.d/01systemd-sysusers/sysusers-dracut.conf
%dir %{dracutlibdir}/modules.d/01systemd-timedated
%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-timedated/module-setup.sh
%dir %{dracutlibdir}/modules.d/01systemd-tmpfiles
@@ -316,15 +325,15 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog/*.sh
%dir %{dracutlibdir}/modules.d/04watchdog-modules
%attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog-modules/module-setup.sh
-%dir %{dracutlibdir}/modules.d/05busybox
-%attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.sh
+#%dir %{dracutlibdir}/modules.d/05busybox
+#%attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.sh
%dir %{dracutlibdir}/modules.d/06dbus-broker
%attr(755,root,root) %{dracutlibdir}/modules.d/06dbus-broker/module-setup.sh
%dir %{dracutlibdir}/modules.d/06dbus-daemon
%attr(755,root,root) %{dracutlibdir}/modules.d/06dbus-daemon/module-setup.sh
-%dir %{dracutlibdir}/modules.d/06rngd
-%attr(755,root,root) %{dracutlibdir}/modules.d/06rngd/module-setup.sh
-%{dracutlibdir}/modules.d/06rngd/rngd.service
+#%dir %{dracutlibdir}/modules.d/06rngd
+#%attr(755,root,root) %{dracutlibdir}/modules.d/06rngd/module-setup.sh
+#%{dracutlibdir}/modules.d/06rngd/rngd.service
%dir %{dracutlibdir}/modules.d/09dbus
%attr(755,root,root) %{dracutlibdir}/modules.d/09dbus/module-setup.sh
%dir %{dracutlibdir}/modules.d/10i18n
@@ -333,10 +342,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh
%dir %{dracutlibdir}/modules.d/30convertfs
%attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh
-%dir %{dracutlibdir}/modules.d/50drm
-%attr(755,root,root) %{dracutlibdir}/modules.d/50drm/module-setup.sh
-%dir %{dracutlibdir}/modules.d/50plymouth
-%attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
+#%dir %{dracutlibdir}/modules.d/50drm
+#%attr(755,root,root) %{dracutlibdir}/modules.d/50drm/module-setup.sh
+%dir %{dracutlibdir}/modules.d/45plymouth
+%attr(755,root,root) %{dracutlibdir}/modules.d/45plymouth/*.sh
%dir %{dracutlibdir}/modules.d/62bluetooth
%attr(755,root,root) %{dracutlibdir}/modules.d/62bluetooth/module-setup.sh
%dir %{dracutlibdir}/modules.d/80cms
@@ -391,8 +400,8 @@ rm -rf $RPM_BUILD_ROOT
%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/90systemd-cryptsetup
-%attr(755,root,root) %{dracutlibdir}/modules.d/90systemd-cryptsetup/module-setup.sh
+#%dir %{dracutlibdir}/modules.d/90systemd-cryptsetup
+#%attr(755,root,root) %{dracutlibdir}/modules.d/90systemd-cryptsetup/module-setup.sh
%dir %{dracutlibdir}/modules.d/91crypt-gpg
%{dracutlibdir}/modules.d/91crypt-gpg/README
%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
@@ -439,9 +448,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh
%dir %{dracutlibdir}/modules.d/95terminfo
%attr(755,root,root) %{dracutlibdir}/modules.d/95terminfo/*.sh
-%dir %{dracutlibdir}/modules.d/95udev-rules
-%{dracutlibdir}/modules.d/95udev-rules/*.rules
-%attr(755,root,root) %{dracutlibdir}/modules.d/95udev-rules/*.sh
+#%dir %{dracutlibdir}/modules.d/95udev-rules
+#%{dracutlibdir}/modules.d/95udev-rules/*.rules
+#%attr(755,root,root) %{dracutlibdir}/modules.d/95udev-rules/*.sh
%dir %{dracutlibdir}/modules.d/95virtfs
%attr(755,root,root) %{dracutlibdir}/modules.d/95virtfs/*.sh
%dir %{dracutlibdir}/modules.d/96securityfs
@@ -545,8 +554,8 @@ rm -rf $RPM_BUILD_ROOT
%{dracutlibdir}/modules.d/35network-manager/nm-wait-online-initrd.service
%dir %{dracutlibdir}/modules.d/40network
%attr(755,root,root) %{dracutlibdir}/modules.d/40network/*.sh
-%dir %{dracutlibdir}/modules.d/45ifcfg
-%attr(755,root,root) %{dracutlibdir}/modules.d/45ifcfg/*.sh
+#%dir %{dracutlibdir}/modules.d/45ifcfg
+#%attr(755,root,root) %{dracutlibdir}/modules.d/45ifcfg/*.sh
%dir %{dracutlibdir}/modules.d/45net-lib
%attr(755,root,root) %{dracutlibdir}/modules.d/45net-lib/*.sh
%dir %{dracutlibdir}/modules.d/45url-lib
@@ -580,7 +589,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%dir %{dracutlibdir}/modules.d/01fips
%attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh
-%config(noreplace) %{_sysconfdir}/dracut.conf.d/40-fips.conf
+%config(noreplace) %{_sysconfdir}/dracut.conf.d/50-fips.conf
%files caps
%defattr(644,root,root,755)
diff --git a/bash.patch b/bash.patch
index 4c56e4d..a291f73 100644
--- a/bash.patch
+++ b/bash.patch
@@ -1,19 +1,18 @@
---- dracut-055/modules.d/00bash/module-setup.sh~ 2021-05-27 14:34:19.000000000 +0200
-+++ dracut-055/modules.d/00bash/module-setup.sh 2021-10-30 23:03:00.931687353 +0200
-@@ -9,7 +9,7 @@
+--- dracut-ng-106/modules.d/00bash/module-setup.sh.orig 2025-02-20 00:55:23.249992313 +0100
++++ dracut-ng-106/modules.d/00bash/module-setup.sh 2025-02-20 00:56:14.403325641 +0100
+@@ -8,7 +8,7 @@
require_binaries bash || return 1
# Return 255 to only include the module, if another module requires it.
- return 255
+ return 0
-
}
-@@ -27,6 +27,6 @@
+ # Install the required file(s) and directories for the module in the initramfs.
+@@ -16,5 +16,5 @@
inst /bin/bash
# Prefer bash as default shell if no other shell is preferred.
- [[ -L $initdir/bin/sh ]] || ln -sf bash "${initdir}/bin/sh"
+ ln -sf bash "${initdir}/bin/sh"
-
}
diff --git a/convertfs-libx32.patch b/convertfs-libx32.patch
new file mode 100644
index 0000000..91265bb
--- /dev/null
+++ b/convertfs-libx32.patch
@@ -0,0 +1,74 @@
+--- dracut-ng-106/modules.d/30convertfs/convertfs.sh~ 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106/modules.d/30convertfs/convertfs.sh 2025-02-19 23:36:17.623325763 +0100
+@@ -34,7 +34,7 @@
+ fi
+
+ needconvert() {
+- for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64"; do
++ for dir in "$ROOT/bin" "$ROOT/sbin" "$ROOT/lib" "$ROOT/lib64" "$ROOT/libx32"; do
+ if [[ -e $dir ]]; then
+ [[ -L $dir ]] || return 0
+ fi
+@@ -96,7 +96,7 @@
+ set -e
+
+ # merge / and /usr in new dir in /usr
+-for dir in bin sbin lib lib64; do
++for dir in bin sbin lib lib64 libx32; do
+ rm -rf -- "$ROOT/usr/${dir}.usrmove-new"
+ [[ -L "$ROOT/$dir" ]] && continue
+ [[ -d "$ROOT/$dir" ]] || continue
+@@ -119,7 +119,7 @@
+ [[ -L "$o" ]] && mv -f "$p" "$o"' ';' || :
+ done
+ # switch over merged dirs in /usr
+-for dir in bin sbin lib lib64; do
++for dir in bin sbin lib lib64 libx32; do
+ [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] || continue
+ echo "Switch to new \`$ROOT/usr/$dir'."
+ rm -fr -- "$ROOT/usr/${dir}.usrmove-old"
+@@ -128,7 +128,7 @@
+ done
+
+ # replace dirs in / with links to /usr
+-for dir in bin sbin lib lib64; do
++for dir in bin sbin lib lib64 libx32; do
+ [[ -L "$ROOT/$dir" ]] && continue
+ [[ -d "$ROOT/$dir" ]] || continue
+ echo "Create \`$ROOT/$dir' symlink."
+@@ -139,7 +139,7 @@
+
+ echo "Clean up backup files."
+ # everything seems to work; cleanup
+-for dir in bin sbin lib lib64; do
++for dir in bin sbin lib lib64 libx32; do
+ # if we get killed in the middle of "rm -rf", ensure not to leave
+ # an incomplete directory, which is moved back by cleanup()
+ [[ -d "$ROOT/usr/${dir}.usrmove-old" ]] \
+@@ -148,7 +148,7 @@
+ && mv "$ROOT/${dir}.usrmove-old" "$ROOT/${dir}.usrmove-old~"
+ done
+
+-for dir in bin sbin lib lib64; do
++for dir in bin sbin lib lib64 libx32; do
+ if [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]]; then
+ rm -rf -- "$ROOT/usr/${dir}.usrmove-old~"
+ fi
+@@ -158,7 +158,7 @@
+ fi
+ done
+
+-for dir in lib lib64; do
++for dir in lib lib64 libx32; do
+ [[ -d "$ROOT/$dir" ]] || continue
+ for lib in "$ROOT"/usr/"${dir}"/lib*.so*.usrmove~; do
+ [[ -f $lib ]] || continue
+@@ -178,7 +178,7 @@
+
+ if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts ]; then
+ echo "Fixing SELinux labels"
+- setfiles -r "$ROOT" -p /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts "$ROOT"/sbin "$ROOT"/bin "$ROOT"/lib "$ROOT"/lib64 "$ROOT"/usr/lib "$ROOT"/usr/lib64 "$ROOT"/etc/ld.so.cache "$ROOT"/var/cache/ldconfig || :
++ setfiles -r "$ROOT" -p /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts "$ROOT"/sbin "$ROOT"/bin "$ROOT"/lib "$ROOT"/lib64 "$ROOT"/libx32 "$ROOT"/usr/lib "$ROOT"/usr/lib64 "$ROOT"/usr/libx32 "$ROOT"/etc/ld.so.cache "$ROOT"/var/cache/ldconfig || :
+ fi
+
+ echo "Done."
diff --git a/no-usr.patch b/no-usr.patch
new file mode 100644
index 0000000..1821c9d
--- /dev/null
+++ b/no-usr.patch
@@ -0,0 +1,201 @@
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-cmdline-ask.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-cmdline-ask.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-cmdline-ask.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-cmdline-ask.service 2025-02-20 00:52:16.763325691 +0100
+@@ -19,7 +19,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ Type=oneshot
+-ExecStart=-/usr/bin/dracut-cmdline-ask
++ExecStart=-/bin/dracut-cmdline-ask
+ StandardInput=tty
+ StandardOutput=inherit
+ StandardError=inherit
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-cmdline.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-cmdline.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-cmdline.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-cmdline.service 2025-02-20 00:52:16.763325691 +0100
+@@ -19,7 +19,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ Type=oneshot
+-ExecStart=-/usr/bin/dracut-cmdline
++ExecStart=-/bin/dracut-cmdline
+ StandardInput=null
+ StandardError=journal+console
+ KillMode=process
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-emergency.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-emergency.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-emergency.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-emergency.service 2025-02-20 00:52:16.763325691 +0100
+@@ -13,7 +13,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ WorkingDirectory=/
+-ExecStart=-/usr/bin/dracut-emergency
++ExecStart=-/bin/dracut-emergency
+ ExecStopPost=-/bin/rm -f -- /.console_lock
+ Type=oneshot
+ StandardInput=tty-force
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-initqueue.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-initqueue.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-initqueue.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-initqueue.service 2025-02-20 00:52:16.763325691 +0100
+@@ -17,7 +17,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ Type=oneshot
+-ExecStart=-/usr/bin/dracut-initqueue
++ExecStart=-/bin/dracut-initqueue
+ StandardInput=null
+ StandardError=journal+console
+ KillMode=process
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-mount.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-mount.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-mount.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-mount.service 2025-02-20 00:52:16.766659025 +0100
+@@ -15,7 +15,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ Type=oneshot
+-ExecStart=-/usr/bin/dracut-mount
++ExecStart=-/bin/dracut-mount
+ StandardInput=null
+ StandardError=journal+console
+ KillMode=process
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-pre-mount.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-pre-mount.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-pre-mount.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-pre-mount.service 2025-02-20 00:52:16.766659025 +0100
+@@ -15,7 +15,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ Type=oneshot
+-ExecStart=-/usr/bin/dracut-pre-mount
++ExecStart=-/bin/dracut-pre-mount
+ StandardInput=null
+ StandardError=journal+console
+ KillMode=process
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-pre-pivot.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-pre-pivot.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-pre-pivot.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-pre-pivot.service 2025-02-20 00:52:16.766659025 +0100
+@@ -23,7 +23,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ Type=oneshot
+-ExecStart=-/usr/bin/dracut-pre-pivot
++ExecStart=-/bin/dracut-pre-pivot
+ StandardInput=null
+ StandardError=journal+console
+ KillMode=process
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-pre-trigger.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-pre-trigger.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-pre-trigger.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-pre-trigger.service 2025-02-20 00:52:16.766659025 +0100
+@@ -16,7 +16,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ Type=oneshot
+-ExecStart=-/usr/bin/dracut-pre-trigger
++ExecStart=-/bin/dracut-pre-trigger
+ StandardInput=null
+ StandardError=journal+console
+ KillMode=process
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/dracut-pre-udev.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-pre-udev.service
+--- dracut-ng-106/modules.d/98dracut-systemd/dracut-pre-udev.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/dracut-pre-udev.service 2025-02-20 00:52:16.766659025 +0100
+@@ -20,7 +20,7 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ Type=oneshot
+-ExecStart=-/usr/bin/dracut-pre-udev
++ExecStart=-/bin/dracut-pre-udev
+ StandardInput=null
+ StandardError=journal+console
+ KillMode=process
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/emergency.service dracut-ng-106-rootdir/modules.d/98dracut-systemd/emergency.service
+--- dracut-ng-106/modules.d/98dracut-systemd/emergency.service 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/emergency.service 2025-02-20 00:52:16.766659025 +0100
+@@ -14,8 +14,8 @@
+ Environment=DRACUT_SYSTEMD=1
+ Environment=NEWROOT=/sysroot
+ WorkingDirectory=/
+-ExecStart=/usr/bin/dracut-emergency
+-ExecStopPost=-/usr/bin/systemctl --fail --no-block default
++ExecStart=/bin/dracut-emergency
++ExecStopPost=-/bin/systemctl --fail --no-block default
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit
+diff -ur dracut-ng-106/modules.d/98dracut-systemd/module-setup.sh dracut-ng-106-rootdir/modules.d/98dracut-systemd/module-setup.sh
+--- dracut-ng-106/modules.d/98dracut-systemd/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/98dracut-systemd/module-setup.sh 2025-02-20 00:52:16.766659025 +0100
+@@ -31,21 +31,21 @@
+
+ # called by dracut
+ install() {
+- inst_script "$moddir/dracut-emergency.sh" /usr/bin/dracut-emergency
++ inst_script "$moddir/dracut-emergency.sh" /bin/dracut-emergency
+ inst_simple "$moddir/emergency.service" "${systemdsystemunitdir}"/emergency.service
+ inst_simple "$moddir/dracut-emergency.service" "${systemdsystemunitdir}"/dracut-emergency.service
+ inst_simple "$moddir/emergency.service" "${systemdsystemunitdir}"/rescue.service
+
+ ln_r "${systemdsystemunitdir}/initrd.target" "${systemdsystemunitdir}/default.target"
+
+- inst_script "$moddir/dracut-cmdline.sh" /usr/bin/dracut-cmdline
+- inst_script "$moddir/dracut-cmdline-ask.sh" /usr/bin/dracut-cmdline-ask
+- inst_script "$moddir/dracut-pre-udev.sh" /usr/bin/dracut-pre-udev
+- inst_script "$moddir/dracut-pre-trigger.sh" /usr/bin/dracut-pre-trigger
+- inst_script "$moddir/dracut-initqueue.sh" /usr/bin/dracut-initqueue
+- inst_script "$moddir/dracut-pre-mount.sh" /usr/bin/dracut-pre-mount
+- inst_script "$moddir/dracut-mount.sh" /usr/bin/dracut-mount
+- inst_script "$moddir/dracut-pre-pivot.sh" /usr/bin/dracut-pre-pivot
++ inst_script "$moddir/dracut-cmdline.sh" /bin/dracut-cmdline
++ inst_script "$moddir/dracut-cmdline-ask.sh" /bin/dracut-cmdline-ask
++ inst_script "$moddir/dracut-pre-udev.sh" /bin/dracut-pre-udev
++ inst_script "$moddir/dracut-pre-trigger.sh" /bin/dracut-pre-trigger
++ inst_script "$moddir/dracut-initqueue.sh" /bin/dracut-initqueue
++ inst_script "$moddir/dracut-pre-mount.sh" /bin/dracut-pre-mount
++ inst_script "$moddir/dracut-mount.sh" /bin/dracut-mount
++ inst_script "$moddir/dracut-pre-pivot.sh" /bin/dracut-pre-pivot
+
+ inst_script "$moddir/rootfs-generator.sh" "$systemdutildir"/system-generators/dracut-rootfs-generator
+
+diff -ur dracut-ng-106/modules.d/99base/module-setup.sh dracut-ng-106-rootdir/modules.d/99base/module-setup.sh
+--- dracut-ng-106/modules.d/99base/module-setup.sh 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/99base/module-setup.sh 2025-02-20 00:52:39.066659021 +0100
+@@ -36,10 +36,10 @@
+ kmod \
+ less
+
+- inst_binary "${dracutbasedir}/dracut-util" "/usr/bin/dracut-util"
++ inst_binary "${dracutbasedir}/dracut-util" "/bin/dracut-util"
+
+- ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
+- ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
++ ln -s dracut-util "${initdir}/bin/dracut-getarg"
++ ln -s dracut-util "${initdir}/bin/dracut-getargs"
+
+ # fallback when shell-interpreter is not included
+ [ ! -e "${initdir}/bin/sh" ] && inst_simple "${initdir}/bin/sh" "/bin/sh"
+diff -ur dracut-ng-106/modules.d/99img-lib/img-lib.sh dracut-ng-106-rootdir/modules.d/99img-lib/img-lib.sh
+--- dracut-ng-106/modules.d/99img-lib/img-lib.sh 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/modules.d/99img-lib/img-lib.sh 2025-02-20 00:53:00.743325684 +0100
+@@ -129,7 +129,7 @@
+ echo 'Warning!!!'\n\
+ echo 'The memory size of your system is too small for this live image.'\n\
+ echo 'Expect killed processes due to out of memory conditions.'\n\
+- echo \n/" /usr/bin/dracut-emergency
++ echo \n/" /bin/dracut-emergency
+
+ emergency_shell
+ elif [ $((runavail - imgsize)) -lt "$minmem" ]; then
+diff -ur dracut-ng-106/test/TEST-60-NFS/test.sh dracut-ng-106-rootdir/test/TEST-60-NFS/test.sh
+--- dracut-ng-106/test/TEST-60-NFS/test.sh 2025-02-01 02:20:41.000000000 +0100
++++ dracut-ng-106-rootdir/test/TEST-60-NFS/test.sh 2025-02-20 00:53:12.566659018 +0100
+@@ -315,9 +315,9 @@
+ inst_simple "${PKGLIBDIR}/modules.d/45url-lib/url-lib.sh" "/lib/url-lib.sh"
+ inst_simple "${PKGLIBDIR}/modules.d/45net-lib/net-lib.sh" "/lib/net-lib.sh"
+ inst_simple "${PKGLIBDIR}/modules.d/95nfs/nfs-lib.sh" "/lib/nfs-lib.sh"
+- inst_binary "${PKGLIBDIR}/dracut-util" "/usr/bin/dracut-util"
+- ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
+- ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
++ inst_binary "${PKGLIBDIR}/dracut-util" "/bin/dracut-util"
++ ln -s dracut-util "${initdir}/bin/dracut-getarg"
++ ln -s dracut-util "${initdir}/bin/dracut-getargs"
+
+ inst ./client-init.sh /sbin/init
+ inst_simple /etc/os-release
diff --git a/plymouth-libdir.patch b/plymouth-libdir.patch
index 708555a..4c09702 100644
--- a/plymouth-libdir.patch
+++ b/plymouth-libdir.patch
@@ -1,11 +1,13 @@
---- dracut-047/modules.d/50plymouth/module-setup.sh.orig 2018-02-19 19:28:23.170948639 +0100
-+++ dracut-047/modules.d/50plymouth/module-setup.sh 2018-02-19 19:29:29.467174216 +0100
-@@ -1,7 +1,7 @@
+--- dracut-ng-106/modules.d/45plymouth/module-setup.sh.orig 2025-02-20 00:44:56.963325756 +0100
++++ dracut-ng-106/modules.d/45plymouth/module-setup.sh 2025-02-20 00:46:23.059992410 +0100
+@@ -1,9 +1,7 @@
#!/bin/bash
pkglib_dir() {
- local _dirs="/usr/lib/plymouth /usr/libexec/plymouth/"
+- local _arch=${DRACUT_ARCH:-$(uname -m)}
+- [ -n "$_arch" ] && _dirs+=" /usr/lib/$_arch/plymouth"
+ local _dirs="@libexecdir@/plymouth/"
- if find_binary dpkg-architecture &> /dev/null; then
- local _arch
- _arch=$(dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null)
+ for _dir in $_dirs; do
+ if [ -x "$dracutsysrootdir""$_dir"/plymouth-populate-initrd ]; then
+ echo "$_dir"
diff --git a/systemd-paths.patch b/systemd-paths.patch
deleted file mode 100644
index 012c665..0000000
--- a/systemd-paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dracut-047/modules.d/98dracut-systemd/emergency.service.orig 2018-02-19 19:33:03.992393899 +0100
-+++ dracut-047/modules.d/98dracut-systemd/emergency.service 2018-02-19 19:34:10.421940966 +0100
-@@ -16,7 +16,7 @@
- Environment=NEWROOT=/sysroot
- WorkingDirectory=/
- ExecStart=/bin/dracut-emergency
--ExecStopPost=-/usr/bin/systemctl --fail --no-block default
-+ExecStopPost=-/bin/systemctl --fail --no-block default
- Type=idle
- StandardInput=tty-force
- StandardOutput=inherit
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/1fb5cd69a18ef6ab39b49587829ef661849e2b57
More information about the pld-cvs-commit
mailing list