]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: install the dbus aliases for resolve1 and network1 in /etc
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 19 Apr 2017 14:32:42 +0000 (10:32 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 24 Apr 2017 01:47:29 +0000 (21:47 -0400)
This way when the units are disabled, their dbus activation is also disabled.

v2:
- fix the symlink location

units/meson.build

index 58d9e2b28ffd6ab6a5feab69d6b90b1867547c0e..0cc5f8861a19849fc01cbe830fec07d904703724 100644 (file)
@@ -216,10 +216,10 @@ m4_in_units = [
         ['console-getty.service',              ''],
         ['container-getty@.service',           ''],
         ['systemd-networkd.service',           'ENABLE_NETWORKD',
-         'dbus-org.freedesktop.network1.service ' +
+         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
          join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
         ['systemd-resolved.service',           'ENABLE_RESOLVED',
-         'dbus-org.freedesktop.resolve1.service ' +
+         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
          join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
         ['user@.service',                      ''],
 ]