From: Ray Strode <rstrode@redhat.com>
Date: Mon, 23 Jul 2012 17:08:45 +0000 (-0400)
Subject: systemd: add plymouth-switch-root.service
X-Git-Tag: 0.8.7~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63737f30c8728cf06dded4f6d7c2cb84d64ee914;p=thirdparty%2Fplymouth.git

systemd: add plymouth-switch-root.service

This service file is needed by systemdized dracut to ensure we properly
transition from the initrd to the root file system
---

diff --git a/configure.ac b/configure.ac
index 6d8fed7a..e7220143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,6 +464,7 @@ AC_CONFIG_FILES([Makefile
            systemd-units/plymouth-read-write.service
            systemd-units/plymouth-reboot.service
            systemd-units/plymouth-start.service
+           systemd-units/plymouth-switch-root.service
            systemd-units/systemd-ask-password-plymouth.path
            systemd-units/systemd-ask-password-plymouth.service
            systemd-units/Makefile
diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am
index 2f5e61f7..3aa44df3 100644
--- a/systemd-units/Makefile.am
+++ b/systemd-units/Makefile.am
@@ -1,4 +1,5 @@
 systemd_unit_templates =                                                     \
+        plymouth-switch-root.service.in                                      \
         plymouth-start.service.in                                            \
         plymouth-read-write.service.in                                       \
         plymouth-quit.service.in                                             \
@@ -16,12 +17,16 @@ systemdunit_DATA = $(systemd_unit_templates:.in=)
 
 install-data-hook:
 	$(MKDIR_P) -m 0755                                                   \
+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/initrd-switch-root.target.wants\
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants           \
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants        \
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants            \
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants             \
 		$(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 &&                        \
+		$(LN_S) ../plymouth-switch-root.service)
 	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants &&            \
 		rm -f plymouth-start.service plymouth-read-write.service &&  \
 		$(LN_S) ../plymouth-start.service &&                         \
@@ -45,6 +50,8 @@ install-data-hook:
 
 uninstall-hook:
 	rm -f \
+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/initrd-switch-root.target.wants && \
+		rm -f 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 &&         \
diff --git a/systemd-units/plymouth-switch-root.service.in b/systemd-units/plymouth-switch-root.service.in
new file mode 100644
index 00000000..89866555
--- /dev/null
+++ b/systemd-units/plymouth-switch-root.service.in
@@ -0,0 +1,12 @@
+[Unit]
+Description=Plymouth switch root service
+DefaultDependencies=no
+ConditionPathExists=/etc/initrd-release
+Before=initrd-switch-root.service
+
+[Service]
+Type=oneshot
+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth update-root-fs --new-root-dir=/sysroot
+StandardInput=null
+StandardOutput=null
+StandardError=null