diff mbox series

[13/26] network-manager: don't test if the binary exists in the init script

Message ID 20180416022944.13644-14-casantos@datacom.ind.br
State Accepted
Headers show
Series init scripts: don't test if binaries exist | expand

Commit Message

Carlos Santos April 16, 2018, 2:29 a.m. UTC 
The test doesn't make sense. It just exits without any error if the
binary doesn't exist, which is silly.

Replace the NETWORKMANAGER_BIN variable, which was used only once, by
the full path of the binary file.

Drop the now useless variables prefix, exec_prefix and sbindir.

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
 package/network-manager/S45network-manager | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/package/network-manager/S45network-manager b/package/network-manager/S45network-manager
index bb4bf164a5..bc775d3b20 100755
--- a/package/network-manager/S45network-manager
+++ b/package/network-manager/S45network-manager
@@ -3,21 +3,13 @@ 
 # Allow a few customizations from a config file
 test -r /etc/default/NetworkManager && . /etc/default/NetworkManager
 
-prefix=/usr
-exec_prefix=/usr
-sbindir=${exec_prefix}/sbin
-
-NETWORKMANAGER_BIN=${sbindir}/NetworkManager
-
-[ -x $NETWORKMANAGER_BIN ] || exit 0
-
 PID=`pidof NetworkManager`
 case "$1" in
 	start)
 		printf "Starting NetworkManager ... "
 		[ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager
 		if [ -z "$PID" ]; then
-			$NETWORKMANAGER_BIN $NETWORKMANAGER_ARGS
+			/usr/sbin/NetworkManager $NETWORKMANAGER_ARGS
 		fi
 		if [ ! -z "$PID" -o $? -gt 0 ]; then
 			echo "failed!"