- we don't support systemd bloatware

diff --git a/dracut.spec b/dracut.spec
index 064d9514b8f75dcaa52df0107ac8312fae45c87d..47cec7ccea1b347a481dc71cf08d646084cea744 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,18 +1,17 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       040
+Version:       041
 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: e961da9566b3c0dd838f737f879cf339
+# Source0-md5: ccde6cd8ef36b883b68d8e5954369a32
 Source1:       tld.conf
 Patch1:                plymouth-libexec.patch
 Patch2:                os-release.patch
 Patch3:                plymouth-logo.patch
 Patch4:                arch-libdir.patch
-Patch5:                systemd-paths.patch
 Patch6:                prelink-libs.patch
 Patch7:                config.patch
 Patch8:                xz_compressor.patch
@@ -35,7 +34,6 @@ Requires:     grep
 Requires:      gzip
 Requires:      hardlink
 Requires:      sed
-Requires:      systemd-units
 Requires:      udev
 Requires:      util-linux >= 2.22.2-3
 Requires:      vim-rt
@@ -65,7 +63,6 @@ Suggests:     suspend-utils
 Suggests:      syslogdaemon
 Suggests:      xfsprogs
 Conflicts:     kmod < 6
-Conflicts:     systemd < 1:199
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dracutlibdir    %{_prefix}/lib/dracut
@@ -196,7 +193,6 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -221,7 +217,6 @@ install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \
        DESTDIR=$RPM_BUILD_ROOT \
        libdir=%{_prefix}/lib \
        bindir=%{_bindir} \
-       systemdsystemunitdir=%{systemdunitdir} \
        sysconfdir=%{_sysconfdir} \
        mandir=%{_mandir}
 
@@ -265,8 +260,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/00bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/00dash
 %attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
-%dir %{dracutlibdir}/modules.d/00systemd-bootchart
-%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/03modsign
 %attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh
 %dir %{dracutlibdir}/modules.d/03rescue
@@ -365,11 +358,6 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/98syslog/README
 %{dracutlibdir}/modules.d/98syslog/rsyslog.conf
 %attr(755,root,root) %{dracutlibdir}/modules.d/98syslog/*.sh
-%dir %{dracutlibdir}/modules.d/98systemd
-%{dracutlibdir}/modules.d/98systemd/*.service
-%{dracutlibdir}/modules.d/98systemd/*.target
-%attr(755,root,root) %{dracutlibdir}/modules.d/98systemd/*.sh
-%doc %{dracutlibdir}/modules.d/98systemd/*.8*
 %dir %{dracutlibdir}/modules.d/98usrmount
 %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh
 %dir %{dracutlibdir}/modules.d/99base
@@ -386,8 +374,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/skipcpio
 
 %dir /var/lib/initramfs
-%{systemdunitdir}/*.service
-%{systemdunitdir}/*/*.service
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man5/dracut.conf.5*
 %{_mandir}/man7/dracut.cmdline.7*

diff --git a/systemd-paths.patch b/systemd-paths.patch
deleted file mode 100644 (file)
index 6b0e335..0000000
--- a/systemd-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- dracut-026/modules.d/98systemd/rescue.service~     2013-03-08 07:07:48.000000000 +0100
-+++ dracut-026/modules.d/98systemd/rescue.service      2013-03-21 13:23:51.761696508 +0100
-@@ -17,7 +17,7 @@
- ExecStartPre=-/bin/plymouth quit
- ExecStart=-/bin/sh -i -l
- ExecStopPost=-/bin/rm -f -- /.console_lock
--ExecStopPost=-/usr/bin/systemctl --fail --no-block default
-+ExecStopPost=-/bin/systemctl --fail --no-block default
- Type=idle
- StandardInput=tty-force
- StandardOutput=inherit
---- dracut-027/modules.d/98systemd/emergency.service.wiget     2013-03-27 23:05:57.984373121 +0100
-+++ dracut-027/modules.d/98systemd/emergency.service   2013-03-27 23:11:39.569991251 +0100
-@@ -17,7 +17,7 @@ Wants=systemd-vconsole-setup.service
- Environment=HOME=/
- WorkingDirectory=/
- ExecStart=/bin/dracut-emergency
--ExecStopPost=-/usr/bin/systemctl --fail --no-block default
-+ExecStopPost=-/bin/systemctl --fail --no-block default
- Type=oneshot
- StandardInput=tty-force
- StandardOutput=inherit