- merged 043 from PLD, dropped systemd leftovers

diff --git a/dracut.spec b/dracut.spec
index 47cec7ccea1b347a481dc71cf08d646084cea744..c7ae75e38234ae2dd66c99317d1b9d3c84247916 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,12 +1,12 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       041
+Version:       043
 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: ccde6cd8ef36b883b68d8e5954369a32
+# Source0-md5: 85de75ddf00962e7bb0ae387f05794e5
 Source1:       tld.conf
 Patch1:                plymouth-libexec.patch
 Patch2:                os-release.patch
@@ -204,6 +204,10 @@ Bashowe dopełnianie składni dla polecenia dracut.
 find modules.d -name '*.orig' | xargs -r %{__rm}
 
 %build
+# not autoconf generated
+./configure \
+       --sysconfdir=%{_sysconfdir}
+
 %{__make} all doc \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags}"
@@ -214,11 +218,7 @@ install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \
        $RPM_BUILD_ROOT/var/{log,lib/{dracut/overlay,initramfs}}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       libdir=%{_prefix}/lib \
-       bindir=%{_bindir} \
-       sysconfdir=%{_sysconfdir} \
-       mandir=%{_mandir}
+       DESTDIR=$RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
 install -p dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf
@@ -232,6 +232,13 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 # remove gentoo specific modules
 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/50gensplash
 
+# 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,00systemd-bootchart,01systemd-initrd,02systemd-networkd,98dracut-systemd}
+%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90multipath/multipathd.service
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -374,6 +381,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/skipcpio
 
 %dir /var/lib/initramfs
+
+%{_npkgconfigdir}/dracut.pc
+
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man5/dracut.conf.5*
 %{_mandir}/man7/dracut.cmdline.7*
@@ -403,6 +413,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/45ifcfg/*.sh
 %dir %{dracutlibdir}/modules.d/45url-lib
 %attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh
+%dir %{dracutlibdir}/modules.d/90kernel-network-modules
+%attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-network-modules/module-setup.sh
 %dir %{dracutlibdir}/modules.d/90livenet
 %attr(755,root,root) %{dracutlibdir}/modules.d/90livenet/*.sh
 %dir %{dracutlibdir}/modules.d/90qemu-net

diff --git a/tld.conf b/tld.conf
index 516799f999559da37c80951a55077fc5aa190a4b..efbee65cb428600aa77cd6b8d5415214914017fc 100644 (file)
--- a/tld.conf
+++ b/tld.conf
@@ -10,12 +10,5 @@ kernel_cmdline="rd.auto=1"
 # log level
 stdloglvl=3
 
-# systemd options
-systemdutildir=/lib/systemd
-systemdsystemunitdir=/lib/systemd/system
+# otheroptions
 udevdir=/lib/udev
-
-#add_dracutmodules+=" systemd systemd-bootchart "
-
-# for systemd these modules do not make sense
-#omit_dracutmodules+=" bootchart securityfs masterkey integrity selinux "