X-Git-Url: https://git.tld-linux.org/?p=packages%2Fdracut.git;a=blobdiff_plain;f=dracut.spec;h=82010e183756e287a1e5eee1715a61ca2e44b144;hp=1e73810ef02a5f659e06e3a21ff6fd2402ff63cc;hb=679b3850ff6f2e7e6213c1aee89a71537196c894;hpb=9df55c40a178446a7aac96d5882663f58b9716fd

diff --git a/dracut.spec b/dracut.spec
index 1e73810..82010e1 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -16,7 +16,7 @@ Patch4:		compressors.patch
 Patch5:		proc_sys_remount.patch
 Patch6:		misc_fixes.patch
 Patch7:		initrd-release.patch
-Patch8:		no_systemd_udevd.patch
+Patch8:		no_systemd.patch
 Patch9:		crypttab-keyscript.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	asciidoc
@@ -224,11 +224,16 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 # SuSE specific man page
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd-suse.8
 
-# remove systemd stuff
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,01systemd-initrd,02systemd-networkd,98dracut-systemd}
+# remove systemd and related stuff
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,01systemd-initrd,02systemd-networkd,80lvmmerge,98dracut-systemd}
 %{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{90multipath/multipathd,90dmsquash-live/checkisomd5@,90stratis/stratisd-init}.service
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8
 
+# remove other, uncesessary stuff
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/91zipl
+%{__rm} -r $RPM_BUILD_ROOT/usr/lib/kernel/install.d/50-dracut.install
+%{__rm} -r $RPM_BUILD_ROOT/usr/lib/kernel/install.d/51-dracut-rescue.install
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -279,9 +284,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
 %dir %{dracutlibdir}/modules.d/80cms
 %attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh
-%dir %{dracutlibdir}/modules.d/80lvmmerge
-%{dracutlibdir}/modules.d/80lvmmerge/README.md
-%attr(755,root,root) %{dracutlibdir}/modules.d/80lvmmerge/*.sh
 %dir %{dracutlibdir}/modules.d/81cio_ignore
 %attr(755,root,root) %{dracutlibdir}/modules.d/81cio_ignore/*.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
@@ -318,8 +320,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-loop
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
-%dir %{dracutlibdir}/modules.d/91zipl
-%attr(755,root,root) %{dracutlibdir}/modules.d/91zipl/*.sh
 %dir %{dracutlibdir}/modules.d/95dcssblk
 %attr(755,root,root) %{dracutlibdir}/modules.d/95dcssblk/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
@@ -402,9 +402,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man8/mkinitrd.8*
 
-#/usr/lib/kernel/install.d/50-dracut.install
-#/usr/lib/kernel/install.d/51-dracut-rescue.install
-
 %files network
 %defattr(644,root,root,755)
 %dir %{dracutlibdir}/modules.d/40network