dracut-shutdown now executes the unpacking on ExecStop

To ensure that unpacking happens before any boot.automount is stopped,
let dracut-shutdown start as a sysinit.target service and unpack on
ExecStop.

diff --git a/Makefile b/Makefile
index f68960a03547630dbf8f521d8bcb4671383e18db..f8e899e7fb8d6a8195d569cb9bd42c628d8d8298 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,9 +125,9 @@ endif
        if [ -n "$(systemdsystemunitdir)" ]; then \
                mkdir -p $(DESTDIR)$(systemdsystemunitdir); \
                ln -srf $(DESTDIR)$(pkglibdir)/modules.d/98systemd/dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/dracut-shutdown.service; \
-               mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \
+               mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants; \
                ln -s ../dracut-shutdown.service \
-               $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
+               $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/dracut-shutdown.service; \
                mkdir -p $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants; \
                for i in \
                    dracut-cmdline.service \

diff --git a/dracut.spec b/dracut.spec
index 8912938a7730566395f20932ceba647a11dcab72..08d64116d9d4d36a1af8f56d34a4ce607f4703ad 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -399,7 +399,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %dir %{_sharedstatedir}/initramfs
 %if %{defined _unitdir}
 %{_unitdir}/dracut-shutdown.service
-%{_unitdir}/shutdown.target.wants/dracut-shutdown.service
+%{_unitdir}/sysinit.target.wants/dracut-shutdown.service
 %{_unitdir}/dracut-cmdline.service
 %{_unitdir}/dracut-initqueue.service
 %{_unitdir}/dracut-mount.service

diff --git a/modules.d/98systemd/dracut-shutdown.service b/modules.d/98systemd/dracut-shutdown.service
index 3b8b6da6c8feb72e6f4175454c7503e96b0cd710..a4a08ca32b12c280d9a3cb25f375203a76d8bfcb 100644 (file)
--- a/modules.d/98systemd/dracut-shutdown.service
+++ b/modules.d/98systemd/dracut-shutdown.service
@@ -6,15 +6,15 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Restore /run/initramfs
+Description=Restore /run/initramfs on shutdown
 Documentation=man:dracut-shutdown.service(8)
-After=getty@tty1.service display-manager.service
+After=local-fs.target
+Wants=local-fs.target
 Before=systemd-reboot.service shutdown.target
 DefaultDependencies=no
 ConditionPathExists=/run/initramfs/.need_shutdown
 ConditionPathExists=!/run/initramfs/bin/sh
 
 [Service]
-ExecStart=-/usr/lib/dracut/dracut-initramfs-restore
-Type=oneshot
-RemainAfterExit=yes
+ExecStart=/bin/true
+ExecStop=/usr/lib/dracut/dracut-initramfs-restore