Prep v235: Allow elogind to be auto-started by dbus requests

diff --git a/src/login/meson.build b/src/login/meson.build
index acb91cb1eddc2139c2fb42c01e84bc73f246560c..d98b4f43d0d21d030e6bd11de5c8dd99bad5a42b 100644 (file)
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -88,7 +88,7 @@ loginctl_sources += files('''
         eloginctl.h
 '''.split())
 #endif // 1
-#if 0 /// elogind builds itself unconditionally and with some adaptatins
+#if 0 /// elogind builds itself unconditionally and with some adaptations
 # if conf.get('ENABLE_LOGIND', false)
 #         logind_conf = configure_file(
 #                 input : 'logind.conf.in',
@@ -149,7 +149,11 @@ pam_elogind_c = files('pam_elogind.c')
 
 install_data('org.freedesktop.login1.conf',
                 install_dir : dbuspolicydir)
-install_data('org.freedesktop.login1.service',
+logind_service = configure_file(
+        input : 'org.freedesktop.login1.service.in',
+        output : 'org.freedesktop.login1.service',
+        configuration : substs)
+install_data(logind_service,
                 install_dir : dbussystemservicedir)
 
 custom_target(

diff --git a/src/login/org.freedesktop.login1.service b/src/login/org.freedesktop.login1.service.in
similarity index 83%
rename from src/login/org.freedesktop.login1.service
rename to src/login/org.freedesktop.login1.service.in
index e6eaa00ff0808b6c9ca5744687e9814e175df54a..84c80cedd893aab1bdcc6763829066db3c03ab62 100644 (file)
--- a/src/login/org.freedesktop.login1.service
+++ b/src/login/org.freedesktop.login1.service.in
@@ -7,6 +7,5 @@
 
 [D-BUS Service]
 Name=org.freedesktop.login1
-Exec=/bin/false
+Exec=@rootlibexecdir@/elogind --daemon
 User=root
-SystemdService=dbus-org.freedesktop.login1.service