From: Ray Strode <rstrode@redhat.com>
Date: Mon, 9 Jul 2012 15:59:59 +0000 (-0400)
Subject: systemd: add two more files
X-Git-Tag: 0.8.6^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76d0db51c26fff42c03ccf89a8f84193aa95c03f;p=thirdparty%2Fplymouth.git

systemd: add two more files

When plymouth service files were moved from systemd to plymouth
two files got lost in the shuffle.

This commit adds them.

http://bugzilla.freedesktop.org/51573
---

diff --git a/configure.ac b/configure.ac
index 845f22b6..c96fbfe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,6 +464,8 @@ AC_CONFIG_FILES([Makefile
            systemd-units/plymouth-read-write.service
            systemd-units/plymouth-reboot.service
            systemd-units/plymouth-start.service
+           systemd-units/systemd-ask-password-plymouth.path
+           systemd-units/systemd-ask-password-plymouth.service
            systemd-units/Makefile
            docs/Makefile
 ])
diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am
index bb1c8a99..16d132ce 100644
--- a/systemd-units/Makefile.am
+++ b/systemd-units/Makefile.am
@@ -6,7 +6,9 @@ systemd_unit_templates =                                                     \
         plymouth-reboot.service.in                                           \
         plymouth-kexec.service.in                                            \
         plymouth-poweroff.service.in                                         \
-        plymouth-halt.service.in
+        plymouth-halt.service.in                                             \
+        systemd-ask-password-plymouth.path.in                                \
+        systemd-ask-password-plymouth.service.in
 
 if ENABLE_SYSTEMD_INTEGRATION
 systemdunitdir=$(SYSTEMD_UNIT_DIR)
diff --git a/systemd-units/systemd-ask-password-plymouth.path.in b/systemd-units/systemd-ask-password-plymouth.path.in
new file mode 100644
index 00000000..c2ee4206
--- /dev/null
+++ b/systemd-units/systemd-ask-password-plymouth.path.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=Forward Password Requests to Plymouth Directory Watch
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=plymouth-start.service
+Before=basic.target shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
+
+[Path]
+DirectoryNotEmpty=/run/systemd/ask-password
+MakeDirectory=yes
diff --git a/systemd-units/systemd-ask-password-plymouth.service.in b/systemd-units/systemd-ask-password-plymouth.service.in
new file mode 100644
index 00000000..aa9ffc21
--- /dev/null
+++ b/systemd-units/systemd-ask-password-plymouth.service.in
@@ -0,0 +1,12 @@
+[Unit]
+Description=Forward Password Requests to Plymouth
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=plymouth-start.service
+Before=shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
+
+[Service]
+ExecStart=/bin/systemd-tty-ask-password-agent --watch --plymouth