From 89473df6b9cff4ecaea2cee6169555d601d97093 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:56:16 +0100 Subject: [PATCH] update to 040 added patch to fix udevdir detection causing all udev rules to be skipped [release 040-1mamba;Tue Nov 11 2014] --- dracut-040-fix-udevdir-detection.patch | 13 +++++++++++++ dracut.spec | 19 +++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 dracut-040-fix-udevdir-detection.patch diff --git a/dracut-040-fix-udevdir-detection.patch b/dracut-040-fix-udevdir-detection.patch new file mode 100644 index 0000000..8445aa9 --- /dev/null +++ b/dracut-040-fix-udevdir-detection.patch @@ -0,0 +1,13 @@ +--- dracut-040/dracut.sh.orig 2014-11-11 22:39:32.180194759 +0100 ++++ dracut-040/dracut.sh 2014-11-11 22:41:23.392285954 +0100 +@@ -1198,8 +1198,9 @@ + [[ -d $udevdir ]] \ + || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" + if ! [[ -d "$udevdir" ]]; then +- [[ -d /lib/udev ]] && udevdir=/lib/udev ++ [[ -d /lib/udev ]] && udevdir=/lib/udev || { + [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev ++ } + fi + + [[ -d $systemdutildir ]] \ diff --git a/dracut.spec b/dracut.spec index fa8aa3e..69b6fff 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,6 +1,6 @@ Name: dracut -Version: 038 -Release: 3mamba +Version: 040 +Release: 1mamba Summary: Generic, modular initramfs generation tool that can be used across various distributions Group: System/Kernel and Hardware Vendor: openmamba @@ -27,6 +27,7 @@ Patch14: dracut-027-kmod.patch Patch15: dracut-027-find-systemdutildir.patch Patch16: dracut-032-nfs-var-statd-sm.patch Patch17: dracut-032-fix-libdirs.patch +Patch18: dracut-040-fix-udevdir-detection.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -117,12 +118,14 @@ This package conatins extra optional modules for dracut. %patch15 -p1 %patch16 -p1 #%patch17 -p1 +%patch18 -p1 chmod +x modules.d/99squash-live/* # remove *.orig files created by patched to prevent from being installed find . -name "*.orig" -exec rm -f {} \; %build +export CFLAGS="%{optflags} -Wformat" %make \ sysconfdir=%{_sysconfdir} \ systemdsystemunitdir=%{_unitdir} @@ -300,9 +303,9 @@ ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd %dir %{_prefix}/lib/kernel/install.d %{_prefix}/lib/kernel/install.d/50-dracut.install %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install -/lib/systemd/system/dracut-*.service -/lib/systemd/system/shutdown.target.wants/dracut-shutdown.service -/lib/systemd/system/initrd.target.wants/dracut-*.service +%{_unitdir}/dracut-*.service +%{_unitdir}/sysinit.target.wants/dracut-shutdown.service +%{_unitdir}/initrd.target.wants/dracut-*.service %{_datadir}/bash-completion/completions/dracut %{_datadir}/bash-completion/completions/lsinitrd %{_datadir}/pixmaps/openmamba-logo.png @@ -340,9 +343,13 @@ ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd %{_prefix}/lib/dracut/modules.d/90multipath/* %dir %{_prefix}/lib/dracut/modules.d/97biosdevname %{_prefix}/lib/dracut/modules.d/97biosdevname/* -%doc NEWS README README.generic README.kernel README.modules TODO +#%doc NEWS README README.generic README.kernel README.modules TODO %changelog +* Tue Nov 11 2014 Silvan Calarco 040-1mamba +- update to 040 +- added patch to fix udevdir detection causing all udev rules to be skipped + * Mon Aug 25 2014 Silvan Calarco 038-3mamba - also move to -extra multipath which causes disks locking during installation