From ad1e88c676cc240c054827ae5d4e88e45aae2f11 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Fri, 1 Sep 2017 13:35:48 +0200 Subject: [PATCH] Prep v235: Allow elogind to be auto-started by dbus requests --- src/login/meson.build | 8 ++++++-- ...p.login1.service => org.freedesktop.login1.service.in} | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) rename src/login/{org.freedesktop.login1.service => org.freedesktop.login1.service.in} (83%) diff --git a/src/login/meson.build b/src/login/meson.build index acb91cb1e..d98b4f43d 100644 --- 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 e6eaa00ff..84c80cedd 100644 --- 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 -- 2.30.2