data: make service dbus-activatable

Always install the dbus service file and specify the systemd
unit file in it. This makes the service dbus-activatable and
thus we don't need to explicitly enable it (also we have one
less daemon running, if it is not needed).
This commit is contained in:
Christian Kellner 2018-06-28 18:47:07 +03:00
parent 91d2e8ecee
commit cd54ad42c3
3 changed files with 17 additions and 16 deletions

View File

@ -1,3 +1,4 @@
[D-BUS Service] [D-BUS Service]
Name=com.feralinteractive.GameMode Name=com.feralinteractive.GameMode
Exec=@BINDIR@/gamemoded -d Exec=@BINDIR@/gamemoded -d
SystemdService=gamemoded.service

View File

@ -10,16 +10,17 @@ if with_systemd == true
configuration: data_conf, configuration: data_conf,
install_dir: path_systemd_unit_dir, install_dir: path_systemd_unit_dir,
) )
else
# Install the D-BUS service file
configure_file(
input: 'com.feralinteractive.GameMode.service.in',
output: 'com.feralinteractive.GameMode.service',
configuration: data_conf,
install_dir: path_dbus_service_dir,
)
endif endif
# Install the D-BUS service file
configure_file(
input: 'com.feralinteractive.GameMode.service.in',
output: 'com.feralinteractive.GameMode.service',
configuration: data_conf,
install_dir: path_dbus_service_dir,
)
# Install the Polkit action file in all cases # Install the Polkit action file in all cases
configure_file( configure_file(
input: 'com.feralinteractive.GameMode.policy.in', input: 'com.feralinteractive.GameMode.policy.in',

View File

@ -53,12 +53,12 @@ if with_systemd == true
pkgconfig_systemd = dependency('systemd') pkgconfig_systemd = dependency('systemd')
path_systemd_unit_dir = pkgconfig_systemd.get_pkgconfig_variable('systemduserunitdir') path_systemd_unit_dir = pkgconfig_systemd.get_pkgconfig_variable('systemduserunitdir')
endif endif
else endif
# Set the dbus path as appropriate.
path_dbus_service_dir = get_option('with-dbus-service-dir') # Set the dbus path as appropriate.
if path_dbus_service_dir == '' path_dbus_service_dir = get_option('with-dbus-service-dir')
path_dbus_service_dir = join_paths(path_datadir, 'dbus-1', 'services') if path_dbus_service_dir == ''
endif path_dbus_service_dir = join_paths(path_datadir, 'dbus-1', 'services')
endif endif
path_polkit_action_dir = join_paths(path_datadir, 'polkit-1', 'actions') path_polkit_action_dir = join_paths(path_datadir, 'polkit-1', 'actions')
@ -114,11 +114,10 @@ if with_systemd == true
report += [ report += [
' systemd user unit directory: @0@'.format(path_systemd_unit_dir), ' systemd user unit directory: @0@'.format(path_systemd_unit_dir),
] ]
else endif
report += [ report += [
' D-BUS service directory: @0@'.format(path_dbus_service_dir), ' D-BUS service directory: @0@'.format(path_dbus_service_dir),
] ]
endif
report += [ report += [