[systemd-commits] 3 commits - Makefile.am units/user

[Tom Gundersen]

 Makefile.am                            |   22 ++++++++++++++++++----
 units/user/.gitignore                  |    1 +
 units/user/systemd-consoled.service.in |   15 +++++++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit 2355af60dc0c0ec2b7fbe69f15a77d980b017b3f
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Oct 4 13:10:41 2014 +0200

    consoled: add a unit file
    
    The unit file is statically enabled, but still requires --enable-terminal
    to actually get installed.

diff --git a/Makefile.am b/Makefile.am
index 3119a95..e52db17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,6 +250,7 @@ SOCKETS_TARGET_WANTS =
 BUSNAMES_TARGET_WANTS =
 TIMERS_TARGET_WANTS =
 USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
 USER_BUSNAMES_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
@@ -270,6 +271,7 @@ install-target-wants-hook:
 	what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+	what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
 
 install-busnames-target-wants-hook:
 	what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
@@ -3035,6 +3037,15 @@ noinst_PROGRAMS += \
 dist_pkgdata_DATA += \
 	src/libsystemd-terminal/unifont-glyph-array.bin
 
+nodist_userunit_DATA += \
+	units/user/systemd-consoled.service
+
+USER_DEFAULT_TARGET_WANTS += \
+	systemd-consoled.service
+
+EXTRA_DIST += \
+	units/user/systemd-consoled.service.in
+
 tests += \
 	test-term-page \
 	test-term-parser \
diff --git a/units/user/.gitignore b/units/user/.gitignore
index 6aa5475..c91ed62 100644
--- a/units/user/.gitignore
+++ b/units/user/.gitignore
@@ -1,2 +1,3 @@
 /systemd-exit.service
 /systemd-bus-proxyd at .service
+/systemd-consoled.service
diff --git a/units/user/systemd-consoled.service.in b/units/user/systemd-consoled.service.in
new file mode 100644
index 0000000..fd7938a
--- /dev/null
+++ b/units/user/systemd-consoled.service.in
@@ -0,0 +1,15 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Console Manager and Terminal Emulator
+
+[Service]
+Type=notify
+Restart=always
+RestartSec=0
+ExecStart=@rootlibexecdir@/systemd-consoled

commit 10595afb4c007a764b91d28ede5faa00bcb28428
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Oct 4 13:12:49 2014 +0200

    consoled: move from /bin to /lib/systemd
    
    This should not normally be run manually, but rather through systemd.

diff --git a/Makefile.am b/Makefile.am
index d2a1767..3119a95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3024,7 +3024,7 @@ if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
 	libsystemd-terminal.la
 
-bin_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-consoled
 
 noinst_PROGRAMS += \

commit c71202228f31176eee2aa7c798c9f3ff681cf957
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Oct 4 13:11:40 2014 +0200

    systemd-bus-proxyd: distribute the .in file also for the user version

diff --git a/Makefile.am b/Makefile.am
index cca949f..d2a1767 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2477,13 +2477,16 @@ nodist_systemunit_DATA += \
 dist_systemunit_DATA += \
 	units/systemd-bus-proxyd.socket
 
-dist_userunit_DATA += \
-	units/user/systemd-bus-proxyd.socket \
+nodist_userunit_DATA += \
 	units/user/systemd-bus-proxyd at .service
+
+dist_userunit_DATA += \
+	units/user/systemd-bus-proxyd.socket
 endif
 
 EXTRA_DIST += \
-	units/systemd-bus-proxyd at .service.in
+	units/systemd-bus-proxyd at .service.in \
+	units/user/systemd-bus-proxyd at .service.in
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \