From: Gui Iribarren <gui@altermundi.net>
To: The list for a Better Approach To Mobile Ad-hoc Networking
<b.a.t.m.a.n@lists.open-mesh.org>
Subject: [B.A.T.M.A.N.] [PATCH 1/2] alfred: fix batadv-vis invocation in init.d script
Date: Fri, 13 Dec 2013 16:03:47 -0300 [thread overview]
Message-ID: <52AB5A13.2050709@altermundi.net> (raw)
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>
---
alfred/Makefile | 2 +-
alfred/files/alfred.init | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/alfred/Makefile b/alfred/Makefile
index ffc8026..b9c2c33 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_MD5SUM:=3891697e127b1037cfc9349fd96e9993
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).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
}
--
1.8.4.rc3
next reply other threads:[~2013-12-13 19:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-13 19:03 Gui Iribarren [this message]
2013-12-13 19:05 ` [B.A.T.M.A.N.] [PATCH 2/2] alfred: workaround race condition when batmanif is not ready at boot time Gui Iribarren
2013-12-16 15:10 ` [B.A.T.M.A.N.] [PATCH 1/2] alfred: fix batadv-vis invocation in init.d script Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52AB5A13.2050709@altermundi.net \
--to=gui@altermundi.net \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.