systemd: add plymouth-start.service to initrd-switch-root.target

<haraldh> halfline, can you add plymouth-start.service to
plymouth-populate-initrd ??
<halfline> haraldh: sure, can you give me details on the bug its fixing?
<haraldh> except, if you put yourself out of the plymouth cgroup
<haraldh> and the "@" in argv[0][0]
<haraldh> better put plymouth-start.service in the
initrd-switch-root.target
<haraldh> easier
<halfline> well we already do the "@" in argv[0][0]
<halfline> and we already put KillMode=none SendSIGKILL=no in the
service file
<halfline> but will add the change
<haraldh> hmm, ok

diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index d901a9b1d720a20ec592e3000fc059c481e447b4..d25ab07ea1747d84246438db5cefc51e64c40bc7 100755 (executable)
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -432,6 +432,7 @@ if [ -n "$SYSTEMD_UNIT_DIR" -a -d "$SYSTEMD_UNIT_DIR" ]; then
     inst $SYSTEMD_UNIT_DIR/plymouth-halt.service $INITRDDIR
 
     inst $SYSTEMD_UNIT_DIR/initrd-switch-root.target.wants/plymouth-switch-root.service $INITRDDIR
+    inst $SYSTEMD_UNIT_DIR/initrd-switch-root.target.wants/plymouth-start.service $INITRDDIR
     inst $SYSTEMD_UNIT_DIR/sysinit.target.wants/plymouth-start.service $INITRDDIR
     inst $SYSTEMD_UNIT_DIR/multi-user.target.wants/plymouth-quit.service $INITRDDIR
     inst $SYSTEMD_UNIT_DIR/multi-user.target.wants/plymouth-quit-wait.service $INITRDDIR

diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am
index 3aa44df3e0238b2266a06d81383d42d8567f03b1..89355ac066f37d8b1d785cd93ae7406eb7be720a 100644 (file)
--- a/systemd-units/Makefile.am
+++ b/systemd-units/Makefile.am
@@ -25,7 +25,8 @@ install-data-hook:
                $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants          \
                $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants
        (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/initrd-switch-root.target.wants && \
-               rm -f plymouth-switch-root.service &&                        \
+               rm -f plymouth-start.service plymouth-switch-root.service && \
+               $(LN_S) ../plymouth-start.service &&                         \
                $(LN_S) ../plymouth-switch-root.service)
        (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants &&            \
                rm -f plymouth-start.service plymouth-read-write.service &&  \
@@ -51,7 +52,7 @@ install-data-hook:
 uninstall-hook:
        rm -f \
        (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/initrd-switch-root.target.wants && \
-               rm -f plymouth-switch-root.service)                          \
+               rm -f plymouth-start.service plymouth-switch-root.service)   \
        (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants &&            \
                rm -f plymouth-start.service plymouth-read-write.service)    \
        (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants &&         \