[packages] quagga: Do not try to start 'watchquagga' if it is not available

git-svn-id: svn://svn.openwrt.org/openwrt/packages@32675 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 192ec4e..1219843 100644 (file)
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
 PKG_VERSION:=0.99.21
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=99840adbe57047c90dfba6b6ed9aec7f
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/net/quagga/files/quagga b/net/quagga/files/quagga
index 0ccfb1c..b172090 100644 (file)
--- a/net/quagga/files/quagga
+++ b/net/quagga/files/quagga
@@ -33,7 +33,7 @@ DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
 DAEMON_FLAGS=-d
 WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
 WATCHQUAGGA_CMD="$0 watchrestart"
-if [ ${COMMAND} != "watchrestart" ]
+if [ ${COMMAND} != "watchrestart" -a -x "${BINDIR}/watchquagga" ]
 then
        DAEMONS="${DAEMONS} watchquagga"
 fi