diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 5 | ||||
| -rw-r--r-- | data/Makefile.in | 8 | ||||
| -rw-r--r-- | data/console-kit-log-system-restart.service.in | 4 | ||||
| -rw-r--r-- | data/console-kit-log-system-start.service.in | 2 | ||||
| -rw-r--r-- | data/console-kit-log-system-stop.service.in | 4 |
5 files changed, 18 insertions, 5 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index c45f15b..248f7cd 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -47,14 +47,19 @@ install-data-hook: $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants \ $(DESTDIR)$(systemdsystemunitdir)/kexec.target.wants ( cd $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants && \ + rm -f console-kit-log-system-start.service && \ $(LN_S) ../console-kit-log-system-start.service ) ( cd $(DESTDIR)$(systemdsystemunitdir)/halt.target.wants && \ + rm -f console-kit-log-system-stop.service && \ $(LN_S) ../console-kit-log-system-stop.service ) ( cd $(DESTDIR)$(systemdsystemunitdir)/poweroff.target.wants && \ + rm -f console-kit-log-system-stop.service && \ $(LN_S) ../console-kit-log-system-stop.service ) ( cd $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants && \ + rm -f console-kit-log-system-restart.service && \ $(LN_S) ../console-kit-log-system-restart.service ) ( cd $(DESTDIR)$(systemdsystemunitdir)/kexec.target.wants && \ + rm -f console-kit-log-system-restart.service && \ $(LN_S) ../console-kit-log-system-restart.service ) endif diff --git a/data/Makefile.in b/data/Makefile.in index 8ef8fa8..1b45d4d 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -108,6 +108,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -145,6 +146,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -194,6 +196,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -616,14 +619,19 @@ $(service_DATA): $(service_in_files) Makefile @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@ rm -f console-kit-log-system-start.service && \ @HAVE_SYSTEMD_TRUE@ $(LN_S) ../console-kit-log-system-start.service ) @HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/halt.target.wants && \ +@HAVE_SYSTEMD_TRUE@ rm -f console-kit-log-system-stop.service && \ @HAVE_SYSTEMD_TRUE@ $(LN_S) ../console-kit-log-system-stop.service ) @HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/poweroff.target.wants && \ +@HAVE_SYSTEMD_TRUE@ rm -f console-kit-log-system-stop.service && \ @HAVE_SYSTEMD_TRUE@ $(LN_S) ../console-kit-log-system-stop.service ) @HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants && \ +@HAVE_SYSTEMD_TRUE@ rm -f console-kit-log-system-restart.service && \ @HAVE_SYSTEMD_TRUE@ $(LN_S) ../console-kit-log-system-restart.service ) @HAVE_SYSTEMD_TRUE@ ( cd $(DESTDIR)$(systemdsystemunitdir)/kexec.target.wants && \ +@HAVE_SYSTEMD_TRUE@ rm -f console-kit-log-system-restart.service && \ @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. diff --git a/data/console-kit-log-system-restart.service.in b/data/console-kit-log-system-restart.service.in index 2e2974e..d69333f 100644 --- a/data/console-kit-log-system-restart.service.in +++ b/data/console-kit-log-system-restart.service.in @@ -2,8 +2,8 @@ Description=Console System Reboot Logging DefaultDependencies=no Wants=sysinit.target -After=sysinit.target console-kit-system-start.service -Before=shutdown.service +After=sysinit.target console-kit-log-system-start.service +Before=shutdown.target [Service] Type=oneshot diff --git a/data/console-kit-log-system-start.service.in b/data/console-kit-log-system-start.service.in index 5900bf0..e84c5b1 100644 --- a/data/console-kit-log-system-start.service.in +++ b/data/console-kit-log-system-start.service.in @@ -3,7 +3,7 @@ Description=Console System Startup Logging DefaultDependencies=no Wants=sysinit.target After=sysinit.target -Before=shutdown.service +Before=shutdown.target [Service] Type=oneshot diff --git a/data/console-kit-log-system-stop.service.in b/data/console-kit-log-system-stop.service.in index 97d03e4..8e7a4d0 100644 --- a/data/console-kit-log-system-stop.service.in +++ b/data/console-kit-log-system-stop.service.in @@ -2,8 +2,8 @@ Description=Console System Shutdown Logging DefaultDependencies=no Wants=sysinit.target -After=sysinit.target console-kit-system-start.service -Before=shutdown.service +After=sysinit.target console-kit-log-system-start.service +Before=shutdown.target [Service] Type=oneshot |