浏览代码

network-manager: don't test if the binary exists in the init script

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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Carlos Santos 7 年之前
父节点
当前提交
047341e6eb
共有 1 个文件被更改,包括 1 次插入9 次删除
  1. 1 9
      package/network-manager/S45network-manager

+ 1 - 9
package/network-manager/S45network-manager

@@ -3,21 +3,13 @@
 # Allow a few customizations from a config file
 # Allow a few customizations from a config file
 test -r /etc/default/NetworkManager && . /etc/default/NetworkManager
 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`
 PID=`pidof NetworkManager`
 case "$1" in
 case "$1" in
 	start)
 	start)
 		printf "Starting NetworkManager ... "
 		printf "Starting NetworkManager ... "
 		[ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager
 		[ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager
 		if [ -z "$PID" ]; then
 		if [ -z "$PID" ]; then
-			$NETWORKMANAGER_BIN $NETWORKMANAGER_ARGS
+			/usr/sbin/NetworkManager $NETWORKMANAGER_ARGS
 		fi
 		fi
 		if [ ! -z "$PID" -o $? -gt 0 ]; then
 		if [ ! -z "$PID" -o $? -gt 0 ]; then
 			echo "failed!"
 			echo "failed!"