summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2015-07-22 21:35:36 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2015-07-22 21:35:36 +0200
commit71e7cd63d4db9bcc5e107d6fc2dba8624b349e9a (patch)
tree9f22304c3dd2cfcc7d3293f24752b830d8f06908 /debian
parentAdd optional json capability to the "show ip ospf neighbor", "show ip ospf ne... (diff)
downloadfrr-71e7cd63d4db9bcc5e107d6fc2dba8624b349e9a.tar.xz
frr-71e7cd63d4db9bcc5e107d6fc2dba8624b349e9a.zip
watchquagga-mode-3-fix.patch
Watchquagga: In phased restart with zebra, invoke restart all when zebra dies To correctly handle starting and stopping of individual daemons not affecting watchquagga's monitoring, we resorted to fixing up watchquagga's daemon watch list every time a daemon was started or stopped. This was done by restarting watchquagga itself. This meant the handling of phased restart of individual daemons was broken in watchquagga as it attempted to stop daemons individually before starting them all individually. Fix this by restarting all when this happens. This does make mode 4 indistinguishable from mode 1, but I don't understood the point of mode 4 and we don't think users change watchquagga modes. Signed-off-by: Dinesh G Dutt <ddutt@cumulusnetworks.com>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/quagga.init.d4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/quagga.init.d b/debian/quagga.init.d
index b9ad6e666..dbf71ce88 100755
--- a/debian/quagga.init.d
+++ b/debian/quagga.init.d
@@ -469,9 +469,9 @@ if [ ! -d $V_PATH ]; then
chmod 755 /$V_PATH
fi
-if [ -n "$3" ]; then
+if [ -n "$3" ] && [ "$3" != "all" ]; then
dmn="$2"-"$3"
-elif [ -n "$2" ]; then
+elif [ -n "$2" ] && [ "$2" != "all" ]; then
dmn="$2"
fi