[systemd-commits] Makefile.am units/.gitignore units/systemd-networkd.service.in units/systemd-networkd.service.m4.in

[Tom Gundersen]

 Makefile.am                          |    2 -
 units/.gitignore                     |    1 
 units/systemd-networkd.service.in    |   32 ----------------------------
 units/systemd-networkd.service.m4.in |   39 +++++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 33 deletions(-)

New commits:
commit b5acb956d1ceca70e1fc7546534b43b7d81322cc
Author: Tom Gundersen <teg at jklm.no>
Date:   Fri May 15 22:59:24 2015 +0200

    units: make networkd pull in its own .busname unit
    
    The daemon requires the busname unit to operate (on kdbus systems),
    since it contains the policy that allows it to acquire its service
    name.
    
    This fixes https://bugs.freedesktop.org/show_bug.cgi?id=90287

diff --git a/Makefile.am b/Makefile.am
index 861f3b2..211ce6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5920,7 +5920,7 @@ gperf_gperf_sources += \
 	src/network/networkd-netdev-gperf.gperf
 
 EXTRA_DIST += \
-	units/systemd-networkd.service.in \
+	units/systemd-networkd.service.m4.in \
 	units/systemd-networkd-wait-online.service.in
 
 endif
diff --git a/units/.gitignore b/units/.gitignore
index b8f0a0b..d45492d 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -48,6 +48,7 @@
 /systemd-modules-load.service
 /systemd-networkd-wait-online.service
 /systemd-networkd.service
+/systemd-networkd.service.m4
 /systemd-nspawn at .service
 /systemd-poweroff.service
 /systemd-quotacheck.service
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
deleted file mode 100644
index 5a91b8e..0000000
--- a/units/systemd-networkd.service.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Network Service
-Documentation=man:systemd-networkd.service(8)
-ConditionCapability=CAP_NET_ADMIN
-DefaultDependencies=no
-# dbus.service can be dropped once on kdbus, and systemd-udevd.service can be
-# dropped once tuntap is moved to netlink
-After=systemd-udevd.service dbus.service network-pre.target systemd-sysusers.service
-Before=network.target multi-user.target shutdown.target
-Conflicts=shutdown.target
-Wants=network.target
-
-[Service]
-Type=notify
-Restart=on-failure
-RestartSec=0
-ExecStart=@rootlibexecdir@/systemd-networkd
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
-ProtectSystem=full
-ProtectHome=yes
-WatchdogSec=1min
-
-[Install]
-WantedBy=multi-user.target
-Also=systemd-networkd.socket
diff --git a/units/systemd-networkd.service.m4.in b/units/systemd-networkd.service.m4.in
new file mode 100644
index 0000000..7f216f3
--- /dev/null
+++ b/units/systemd-networkd.service.m4.in
@@ -0,0 +1,39 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Network Service
+Documentation=man:systemd-networkd.service(8)
+ConditionCapability=CAP_NET_ADMIN
+DefaultDependencies=no
+# dbus.service can be dropped once on kdbus, and systemd-udevd.service can be
+# dropped once tuntap is moved to netlink
+After=systemd-udevd.service dbus.service network-pre.target systemd-sysusers.service
+Before=network.target multi-user.target shutdown.target
+Conflicts=shutdown.target
+Wants=network.target
+
+m4_ifdef(`ENABLE_KDBUS',
+# On kdbus systems we pull in the busname explicitly, because it
+# carries policy that allows the daemon to acquire its name.
+Wants=org.freedesktop.network1.busname
+After=org.freedesktop.network1.busname
+
+)m4_dnl
+[Service]
+Type=notify
+Restart=on-failure
+RestartSec=0
+ExecStart=@rootlibexecdir@/systemd-networkd
+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
+ProtectSystem=full
+ProtectHome=yes
+WatchdogSec=1min
+
+[Install]
+WantedBy=multi-user.target
+Also=systemd-networkd.socket