diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-10 17:59:58 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-20 01:27:01 +0200 |
| commit | fb369a5bdf4fdb19d5372334dee6b4f23ff7e7e8 (patch) | |
| tree | cdc01f6f9a8acd181904aa1f17629cfd33030c6b | |
| parent | test-compress*: silence warning about unused definitions when w/o both xz and... (diff) | |
| download | systemd-fb369a5bdf4fdb19d5372334dee6b4f23ff7e7e8.tar.xz systemd-fb369a5bdf4fdb19d5372334dee6b4f23ff7e7e8.zip | |
Makefile.am: link dbus-org.freedesktop.network1 alias in /etc
This makes dbus-org.freedesktop.network1.service like dbus-org.freedesktop.resolve1.service.
When systemd-networkd.service is disabled, the alias is also removed.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | units/systemd-networkd.service.m4.in | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 6ef20c8032..f8c7c1ebb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5933,10 +5933,8 @@ dist_dbuspolicy_DATA += \ GENERAL_ALIASES += \ $(systemunitdir)/systemd-networkd.socket $(pkgsysconfdir)/system/sockets.target.wants/systemd-networkd.socket \ $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ - $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service - -SYSTEM_UNIT_ALIASES += \ - systemd-networkd.service dbus-org.freedesktop.network1.service + $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service \ + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/dbus-org.freedesktop.network1.service BUSNAMES_TARGET_WANTS += \ org.freedesktop.network1.busname diff --git a/units/systemd-networkd.service.m4.in b/units/systemd-networkd.service.m4.in index 5811b00819..15e6ad99d8 100644 --- a/units/systemd-networkd.service.m4.in +++ b/units/systemd-networkd.service.m4.in @@ -42,6 +42,7 @@ ReadWritePaths=/run/systemd [Install] WantedBy=multi-user.target Also=systemd-networkd.socket +Alias=dbus-org.freedesktop.network1.service # We want to enable systemd-networkd-wait-online.service whenever this service # is enabled. systemd-networkd-wait-online.service has |