diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-02-16 17:48:48 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-17 16:03:47 -0500 |
| commit | 4d1f490c9386d1a824ce8269de5ed7938cbf8096 (patch) | |
| tree | 0fde54cd2bdc0ad3a0cd9acb20628d6776d83392 | |
| parent | f73e6ee687213d8f78a93a9519901d0fe314c228 (diff) | |
units: enable resolved bus activation though a symlink in /etc
The change:
-/usr/lib/systemd/system/dbus-org.freedesktop.resolve1.service
+/etc/systemd/system/dbus-org.freedesktop.resolve1.service
If resolved is disabled, without this, talking to the resolved bus API will
activate it regardless whether it is enabled or not, let's fix that.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | units/systemd-resolved.service.m4.in | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index dd10aabd36..09e550da65 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5565,14 +5565,12 @@ dist_dbuspolicy_DATA += \ dist_dbussystemservice_DATA += \ src/resolve/org.freedesktop.resolve1.service -SYSTEM_UNIT_ALIASES += \ - systemd-resolved.service dbus-org.freedesktop.resolve1.service - BUSNAMES_TARGET_WANTS += \ org.freedesktop.resolve1.busname GENERAL_ALIASES += \ - $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service + $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service \ + $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/dbus-org.freedesktop.resolve1.service nodist_pkgsysconf_DATA += \ src/resolve/resolved.conf diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in index 0f0440ddaf..d3b8f81601 100644 --- a/units/systemd-resolved.service.m4.in +++ b/units/systemd-resolved.service.m4.in @@ -38,3 +38,4 @@ SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module @mount @obsolete [Install] WantedBy=multi-user.target +Alias=dbus-org.freedesktop.resolve1.service |