summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Santos <casantos@datacom.ind.br>2018-04-15 23:29:31 -0300
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-04-16 07:34:48 +0200
commit047341e6ebbf483d00303d7b91963bb08e340aa2 (patch)
tree235f3529db587a6b440dd6cb6efc3ef343cb83b0
parentddd035b87e647bc95fdfe42c59ee931d55822a22 (diff)
downloadbuildroot-047341e6ebbf483d00303d7b91963bb08e340aa2.tar.gz
buildroot-047341e6ebbf483d00303d7b91963bb08e340aa2.zip
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>
-rwxr-xr-xpackage/network-manager/S45network-manager10
1 files changed, 1 insertions, 9 deletions
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!"
OpenPOWER on IntegriCloud