Skip to contentSkip to conversation

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

PATCH In review Gui Iribarren 2 participants 3 messages Dec 13, 2013 – Dec 16, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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

---
 alfred/Makefile          |  2 +-
 alfred/files/alfred.init | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
alfred/Makefile +1 -1
index ffc8026..b9c2c33 100644
@@ -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
alfred/files/alfred.init +5 -5
index e52a7bd..b678d4c 100755
@@ -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
 }
Signature · 1 line
1.8.4.rc3
#1 lore raw

PATCH 2/2 alfred: workaround race condition when batmanif is not ready at boot time

Wait up to 30 seconds during init.d script on boot, so that batmanif can come up. If the timeout is reached, the init.d script refuses to start alfred and related daemons.

This prevents an alfred crash when it would start during early boot, before batmanif is available. Instead, alfred is started as soon as batmanif appears, if that happens during the 30-second window.

---
 alfred/Makefile          |  2 +-
 alfred/files/alfred.init | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)
alfred/Makefile +1 -1
index b9c2c33..c8e73c2 100644
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
 #
 PKG_NAME:=alfred
 PKG_VERSION:=2013.4.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=3891697e127b1037cfc9349fd96e9993
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
alfred/files/alfred.init +17 -1
index b678d4c..b777b53 100755
@@ -16,6 +16,7 @@ pid_file_alfred="/var/run/alfred.pid"
 pid_file_vis="/var/run/batadv-vis.pid"
 enable=0
 vis_enable=0
+batmanif=""
 SERVICE_DAEMONIZE=1
 SERVICE_WRITE_PID=1
 
@@ -23,7 +24,7 @@ alfred_start()
 {
 	local args=""
 	local section="$1"
-	local disabled interface mode batmanif
+	local disabled interface mode
 
 	# check if section is disabled
 	config_get_bool disabled "$section" disabled 0
@@ -62,6 +63,21 @@ start()
 	if [ "$enable" = "0" ]; then
 		exit 0
 	fi
+
+	mesh_dir="/sys/class/net/$batmanif/mesh/"
+	if ! [ -d "$mesh_dir" ] ; then
+		timeout=30
+		echo "${initscript}: waiting $timeout secs for $batmanif interface..."
+		for i in $(seq $timeout); do
+			sleep 1
+			[ -d "$mesh_dir" ] && break
+			if [ $i == $timeout ] ; then
+				echo "${initscript}: $batmanif not detected, alfred not starting."
+				exit 1
+			fi
+		done
+	fi
+
 	echo "${initscript}: starting alfred"
 	SERVICE_PID_FILE="$pid_file_alfred"
 	service_start /usr/sbin/alfred ${alfred_args}
Signature · 1 line
1.8.4.rc3
#2 lore raw
In reply to Gui Iribarren
Quoted 5 lines

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

Thanks Guido!

I've applied your patches, resvision 0a7457d and aee1e4f in openwrt-feed- alfred.git and revisions 47a466e and e2cfab7 in [email protected]:openwrt- routing/packages.git.

Thanks,
Simon