[systemd-commits] 2 commits - configure.ac Makefile.am units/.gitignore units/user at .service.in units/user at .service.m4.in
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Fri Dec 27 09:12:53 PST 2013
Makefile.am | 9 +++++----
configure.ac | 4 +++-
units/.gitignore | 2 +-
units/user at .service.in | 18 ------------------
units/user at .service.m4.in | 22 ++++++++++++++++++++++
5 files changed, 31 insertions(+), 24 deletions(-)
New commits:
commit 4acbce79798347cddf1e1d42e9be571e0a041873
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Dec 27 12:08:04 2013 -0500
build-sys: fix generation of user at .service
diff --git a/Makefile.am b/Makefile.am
index 162a7be..7556db8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,7 +489,7 @@ EXTRA_DIST += \
units/user/systemd-exit.service.in \
units/systemd-fsck at .service.in \
units/systemd-fsck-root.service.in \
- units/user at .service.in \
+ units/user at .service.m4.in \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
@@ -508,7 +508,8 @@ CLEANFILES += \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
units/container-getty at .service.m4 \
- units/rescue.service.m4
+ units/rescue.service.m4 \
+ units/user at .service.m4
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
@@ -4612,11 +4613,11 @@ src/%: src/%.m4
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
units/%: units/%.m4
- $(AM_V_M4)$(MKDIR_P) $(dir $@)
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
units/user/%: units/%.m4
- $(AM_V_M4)$(MKDIR_P) $(dir $@)
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
if ENABLE_POLKIT
diff --git a/configure.ac b/configure.ac
index efca1a7..5e30af3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,8 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod])
AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec])
+M4_DEFINES=
+
# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.18],[--flavour no-tmpl])],
@@ -808,6 +810,7 @@ AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by de
if test "x$enable_kdbus" == "xyes"; then
AC_DEFINE(ENABLE_KDBUS, 1, [Define if kdbus support is to be enabled])
have_kdbus=yes
+ M4_DEFINES="$M4_DEFINES -DENABLE_KDBUS"
fi
AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"])
@@ -923,7 +926,6 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
# Location of the init scripts as mandated by LSB
SYSTEM_SYSVINIT_PATH=/etc/init.d
SYSTEM_SYSVRCND_PATH=/etc/rc.d
-M4_DEFINES=
AC_ARG_WITH([sysvinit-path],
[AS_HELP_STRING([--with-sysvinit-path=PATH],
diff --git a/units/.gitignore b/units/.gitignore
index 76c4cb3..6de2aad 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -65,4 +65,4 @@
/systemd-update-utmp.service
/systemd-user-sessions.service
/systemd-vconsole-setup.service
-/user at .service
+/user at .service.m4
diff --git a/units/user at .service.in b/units/user at .service.in
deleted file mode 100644
index 7b7d52b..0000000
--- a/units/user at .service.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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=User Manager for %I
-After=systemd-user-sessions.service
-
-[Service]
-User=%I
-PAMName=systemd-user
-Type=notify
-ExecStart=- at rootlibexecdir@/systemd --user
-m4_ifdef(`ENABLE_KDBUS',
-Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/dev/kdbus/%I-user/bus;unix:path=/run/user/%I/bus
-,m4_dnl
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/bus
-)m4_dnl
-Slice=user-%i.slice
diff --git a/units/user at .service.m4.in b/units/user at .service.m4.in
new file mode 100644
index 0000000..7b7d52b
--- /dev/null
+++ b/units/user at .service.m4.in
@@ -0,0 +1,22 @@
+# 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=User Manager for %I
+After=systemd-user-sessions.service
+
+[Service]
+User=%I
+PAMName=systemd-user
+Type=notify
+ExecStart=- at rootlibexecdir@/systemd --user
+m4_ifdef(`ENABLE_KDBUS',
+Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/dev/kdbus/%I-user/bus;unix:path=/run/user/%I/bus
+,m4_dnl
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/bus
+)m4_dnl
+Slice=user-%i.slice
commit 3dc9f55d6ef15028468eb7179ff8e97b95acd15d
Author: Mantas MikulÄ—nas <grawity at gmail.com>
Date: Fri Dec 27 17:10:36 2013 +0200
units: user at .service: fix user bus path
diff --git a/units/user at .service.in b/units/user at .service.in
index 3f8b59d..7b7d52b 100644
--- a/units/user at .service.in
+++ b/units/user at .service.in
@@ -14,5 +14,9 @@ User=%I
PAMName=systemd-user
Type=notify
ExecStart=- at rootlibexecdir@/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+m4_ifdef(`ENABLE_KDBUS',
+Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/dev/kdbus/%I-user/bus;unix:path=/run/user/%I/bus
+,m4_dnl
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/bus
+)m4_dnl
Slice=user-%i.slice
More information about the systemd-commits
mailing list