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>
This commit is contained in:
Carlos Santos 2018-04-15 23:29:31 -03:00 committed by Thomas Petazzoni
parent ddd035b87e
commit 047341e6eb

View file

@ -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!"