Repository : ssh://git@open-mesh.org/openwrt-feed-alfred

On branch : master

commit aee1e4fe336d71ec963ec5185475bc44b0b094d6 Author: Gui Iribarren gui@altermundi.net Date: Fri Dec 13 16:03:47 2013 -0300

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

aee1e4fe336d71ec963ec5185475bc44b0b094d6 alfred/Makefile | 2 +- alfred/files/alfred.init | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/alfred/Makefile b/alfred/Makefile index 7719dfc..0367ebb 100644 --- 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_REV:=67e0d7e9cad9f1e2143925183da64a14ab28eb0f

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init index e52a7bd..b678d4c 100755 --- 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 }