networkd: Install in /usr/lib/network

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index eded2924663f3ad5102b543c87ef57e9ab50e2bd..707eabeed4ffd0d3e3eaf6b70c1bd59c218b0bde 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ INSTALL_DIRS =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 noinst_DATA =
-sbin_PROGRAMS =
+network_PROGRAMS =
 dist_dbuspolicy_DATA =
 dist_dbussystembus_DATA =
 dist_polkitpolicy_DATA =
@@ -304,7 +304,7 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
-sbin_PROGRAMS += \
+network_PROGRAMS += \
        networkd
 
 dist_networkd_SOURCES = \

diff --git a/src/networkd/networkd.service.in b/src/networkd/networkd.service.in
index 4361023922ddd14e28ce40a20126fc83e2bd8052..7ee8fadffc11cd6bf7e2a808eff3622ce834aca1 100644 (file)
--- a/src/networkd/networkd.service.in
+++ b/src/networkd/networkd.service.in
@@ -15,7 +15,7 @@ AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET
 BusName=org.ipfire.network1
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW
 DeviceAllow=char-* rw
-ExecStart=@sbindir@/networkd
+ExecStart=@networkdir@/networkd
 FileDescriptorStoreMax=512
 LockPersonality=yes
 MemoryDenyWriteExecute=yes