[RFC/PATCH] Install iwd and ead into $sbindir rather than $libexecdir.

[RFC/PATCH] Install iwd and ead into $sbindir rather than $libexecdir.

[Anton Khirnov]

[-- Attachment #1: Type: text/plain, Size: 2993 bytes --]

$libexecdir is supposed to contain "internal" binaries that are not
supposed to be executed "from the outside", e.g. directly by users.
Since iwd is a normal daemon that is directly executed from the outside,
$sbindir is the appropriate place for it.
---
 Makefile.am          | 8 ++++----
 README               | 4 ++--
 src/iwd.service.in   | 2 +-
 wired/ead.service.in | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9d378d3d..9e033599 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,7 +135,7 @@ ell_libell_internal_la_SOURCES = $(ell_headers) $(ell_sources)
 endif
 
 bin_PROGRAMS =
-libexec_PROGRAMS =
+sbin_PROGRAMS =
 noinst_PROGRAMS =
 
 if DBUS_POLICY
@@ -185,7 +185,7 @@ eap_sources = src/eap.c src/eap.h src/eap-private.h \
 				src/mschaputil.h src/mschaputil.c
 
 if DAEMON
-libexec_PROGRAMS += src/iwd
+sbin_PROGRAMS += src/iwd
 
 src_iwd_SOURCES = src/main.c linux/nl80211.h src/iwd.h src/missing.h \
 					src/plugin.h src/plugin.c \
@@ -313,7 +313,7 @@ endif
 endif
 
 if WIRED
-libexec_PROGRAMS += wired/ead
+sbin_PROGRAMS += wired/ead
 
 wired_ead_SOURCES = wired/main.c wired/ethdev.h wired/ethdev.c \
 				wired/network.h wired/network.c \
@@ -627,7 +627,7 @@ ell/ell.h: Makefile
 	done
 
 SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
-		-e 's,@libexecdir\@,$(libexecdir),g' \
+		-e 's,@sbindir\@,$(sbindir),g' \
 		< $< > $@
 
 if RUN_RST2MAN
diff --git a/README b/README
index fed9cf62..cffb8b1b 100644
--- a/README
+++ b/README
@@ -80,7 +80,7 @@ configuration options which are generally useful and enabled by default:
 		Disable installation of Wireless daemon
 
 		By default the Wireless daemon binary iwd is enabled and
-		placed into --libexecdir directory.
+		placed into --sbindir directory.
 
 	--disable-client
 
@@ -159,7 +159,7 @@ that can be enabled if the functionality is required:
 		Enable installation of Ethernet authentication daemon
 
 		This allows enabling the Ethernet daemon binary ead which
-		is then placed into --libexecdir directory.
+		is then placed into --sbindir directory.
 
 		With this option the support for 802.1x for wired Ethernet
 		connections can be enabled. It provides its own D-Bus
diff --git a/src/iwd.service.in b/src/iwd.service.in
index 77819eaf..a85f11fb 100644
--- a/src/iwd.service.in
+++ b/src/iwd.service.in
@@ -6,7 +6,7 @@ Wants=network.target
 [Service]
 Type=dbus
 BusName=net.connman.iwd
-ExecStart=@libexecdir@/iwd
+ExecStart=@sbindir@/iwd
 NotifyAccess=main
 LimitNPROC=1
 Restart=on-failure
diff --git a/wired/ead.service.in b/wired/ead.service.in
index 387fdb68..49b998a5 100644
--- a/wired/ead.service.in
+++ b/wired/ead.service.in
@@ -6,7 +6,7 @@ Wants=network.target
 [Service]
 Type=dbus
 BusName=net.connman.ead
-ExecStart=@libexecdir@/ead
+ExecStart=@sbindir@/ead
 NotifyAccess=main
 LimitNPROC=1
 Restart=on-failure
-- 
2.20.1

Re: [RFC/PATCH] Install iwd and ead into $sbindir rather than $libexecdir.

[Anton Khirnov]

[-- Attachment #1: Type: text/plain, Size: 26 bytes --]

ping

-- 
Anton Khirnov

Re: [RFC/PATCH] Install iwd and ead into $sbindir rather than $libexecdir.

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

Hi Anton,

> $libexecdir is supposed to contain "internal" binaries that are not
> supposed to be executed "from the outside", e.g. directly by users.
> Since iwd is a normal daemon that is directly executed from the outside,
> $sbindir is the appropriate place for it.

how is iwd executed directly by a user? It is only executed as a service. It doesn’t belong in sbin either and the difference between sbin and bin have been removed, because they are not really exit anymore on modern Linux distributions.

Regards

Marcel