alfred: fix batadv-vis invocation in init.d script

broken (wouldn't start, failing silently) since the following commit:
 * "renamed vis to batadv-vis to avoid collisions with other vis binaries"
which renamed only some instances of the "vis" command

Signed-off-by: Gui Iribarren <gui@altermundi.net>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

diff --git a/alfred/Makefile b/alfred/Makefile
index ffc80267066bdc05a74e15581885acc3eceff927..b9c2c33f56cac781dbb163e836297a63fbd5c7c9 100644 (file)
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
 #
 PKG_NAME:=alfred
 PKG_VERSION:=2013.4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=3891697e127b1037cfc9349fd96e9993
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init
index e52a7bd48b1eb3de7f1cd08bd5495979761a664a..b678d4c8be74d970f851b0f2f73e7e9b610e46de 100755 (executable)
--- a/alfred/files/alfred.init
+++ b/alfred/files/alfred.init
@@ -13,7 +13,7 @@ alfred_args=""
 vis_args=""
 facters_dir="/etc/alfred"
 pid_file_alfred="/var/run/alfred.pid"
-pid_file_vis="/var/run/vis.pid"
+pid_file_vis="/var/run/batadv-vis.pid"
 enable=0
 vis_enable=0
 SERVICE_DAEMONIZE=1
@@ -44,7 +44,7 @@ alfred_start()
        enable=1
 
         config_get_bool start_vis "$section" start_vis 0
-        if [ "$start_vis" = 1 ] && [ -x /usr/sbin/vis ]; then
+        if [ "$start_vis" = 1 ] && [ -x /usr/sbin/batadv-vis ]; then
                 vis_enable=1
                 append vis_args "-i $batmanif -s"
         fi
@@ -67,9 +67,9 @@ start()
        service_start /usr/sbin/alfred ${alfred_args}
 
        if [ "$vis_enable" = "1" ]; then
-               echo "${initscript}: starting vis"
+               echo "${initscript}: starting batadv-vis"
                SERVICE_PID_FILE="$pid_file_vis"
-               service_start /usr/sbin/vis ${vis_args}
+               service_start /usr/sbin/batadv-vis ${vis_args}
        fi
 
        if [ "$run_facters" = "1" ]; then
@@ -87,7 +87,7 @@ stop()
        SERVICE_PID_FILE="$pid_file_alfred"
        service_stop /usr/sbin/alfred
        SERVICE_PID_FILE="$pid_file_vis"
-       [ -x /usr/sbin/vis ] && service_stop /usr/sbin/vis
+       [ -x /usr/sbin/batadv-vis ] && service_stop /usr/sbin/batadv-vis
        sed "\|for file in $facters_dir/\* ; do |d" -i /etc/crontabs/root
        /etc/init.d/cron restart
 }