summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-11-17 06:51:26 +0100
committerMichael Biebl <biebl@debian.org>2010-11-17 06:51:26 +0100
commita97ae561891b3a7e78c0482b91c7c3f0d885100c (patch)
tree0cab0daf463c97aab95125d8dd67faeda97e0957 /data
parent3c6531b4348d77778c4fab15e5d8e842bd15e091 (diff)
downloadconsolekit-a97ae561891b3a7e78c0482b91c7c3f0d885100c.tar.gz
Imported Upstream version 0.4.3upstream/0.4.3
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am5
-rw-r--r--data/Makefile.in5
-rw-r--r--data/console-kit-log-system-restart.service.in5
-rw-r--r--data/console-kit-log-system-start.service.in5
-rw-r--r--data/console-kit-log-system-stop.service.in5
5 files changed, 17 insertions, 8 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index bf9e43b..c45f15b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -44,7 +44,8 @@ install-data-hook:
$(DESTDIR)$(systemdsystemunitdir)/basic.target.wants \
$(DESTDIR)$(systemdsystemunitdir)/halt.target.wants \
$(DESTDIR)$(systemdsystemunitdir)/poweroff.target.wants \
- $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants
+ $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants \
+ $(DESTDIR)$(systemdsystemunitdir)/kexec.target.wants
( cd $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants && \
$(LN_S) ../console-kit-log-system-start.service )
( cd $(DESTDIR)$(systemdsystemunitdir)/halt.target.wants && \
@@ -53,6 +54,8 @@ install-data-hook:
$(LN_S) ../console-kit-log-system-stop.service )
( cd $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants && \
$(LN_S) ../console-kit-log-system-restart.service )
+ ( cd $(DESTDIR)$(systemdsystemunitdir)/kexec.target.wants && \
+ $(LN_S) ../console-kit-log-system-restart.service )
endif
edit = sed \
diff --git a/data/Makefile.in b/data/Makefile.in
index f8068d4..8ef8fa8 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -613,7 +613,8 @@ $(service_DATA): $(service_in_files) Makefile
@HAVE_SYSTEMD_TRUE@ $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants \
@HAVE_SYSTEMD_TRUE@ $(DESTDIR)$(systemdsystemunitdir)/halt.target.wants \
@HAVE_SYSTEMD_TRUE@ $(DESTDIR)$(systemdsystemunitdir)/poweroff.target.wants \
-@HAVE_SYSTEMD_TRUE@ $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants
+@HAVE_SYSTEMD_TRUE@ $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants \
+@HAVE_SYSTEMD_TRUE@ $(DESTDIR)$(systemdsystemunitdir)/kexec.target.wants
@HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants && \
@HAVE_SYSTEMD_TRUE@ $(LN_S) ../console-kit-log-system-start.service )
@HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/halt.target.wants && \
@@ -622,6 +623,8 @@ $(service_DATA): $(service_in_files) Makefile
@HAVE_SYSTEMD_TRUE@ $(LN_S) ../console-kit-log-system-stop.service )
@HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants && \
@HAVE_SYSTEMD_TRUE@ $(LN_S) ../console-kit-log-system-restart.service )
+@HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/kexec.target.wants && \
+@HAVE_SYSTEMD_TRUE@ $(LN_S) ../console-kit-log-system-restart.service )
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/console-kit-log-system-restart.service.in b/data/console-kit-log-system-restart.service.in
index 905b330..2e2974e 100644
--- a/data/console-kit-log-system-restart.service.in
+++ b/data/console-kit-log-system-restart.service.in
@@ -1,8 +1,9 @@
[Unit]
Description=Console System Reboot Logging
DefaultDependencies=no
-Before=poweroff.service reboot.service halt.service killall.service
-After=console-kit-system-start.service
+Wants=sysinit.target
+After=sysinit.target console-kit-system-start.service
+Before=shutdown.service
[Service]
Type=oneshot
diff --git a/data/console-kit-log-system-start.service.in b/data/console-kit-log-system-start.service.in
index 56e1022..5900bf0 100644
--- a/data/console-kit-log-system-start.service.in
+++ b/data/console-kit-log-system-start.service.in
@@ -1,8 +1,9 @@
[Unit]
Description=Console System Startup Logging
DefaultDependencies=no
-Before=poweroff.service reboot.service halt.service killall.service
-After=local-fs.target
+Wants=sysinit.target
+After=sysinit.target
+Before=shutdown.service
[Service]
Type=oneshot
diff --git a/data/console-kit-log-system-stop.service.in b/data/console-kit-log-system-stop.service.in
index 3292238..97d03e4 100644
--- a/data/console-kit-log-system-stop.service.in
+++ b/data/console-kit-log-system-stop.service.in
@@ -1,8 +1,9 @@
[Unit]
Description=Console System Shutdown Logging
DefaultDependencies=no
-Before=poweroff.service reboot.service halt.service killall.service
-After=console-kit-system-start.service
+Wants=sysinit.target
+After=sysinit.target console-kit-system-start.service
+Before=shutdown.service
[Service]
Type=oneshot