From 09d3fdd15c9bf316127f13a9322fdbea13a2628c Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Thu, 17 Apr 2008 13:31:41 -0700
Subject: Disable watchlink from the build

No longer build/start/install watchlink
---
 debian/lintian              | 1 -
 debian/rules                | 2 +-
 debian/vyatta-quagga.init.d | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/lintian b/debian/lintian
index 8368204a..08d952e9 100644
--- a/debian/lintian
+++ b/debian/lintian
@@ -1,3 +1,2 @@
 vyatta-quagga: binary-without-manpage usr/sbin/vyatta-ospfclient
 vyatta-quagga: binary-without-manpage usr/sbin/vyatta-watchquagga
-vyatta-quagga: binary-without-manpage usr/sbin/vyatta-watchlink
diff --git a/debian/rules b/debian/rules
index 7681bcb3..9f82468e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ configure	+= --enable-vtysh
 configure	+= --enable-ipv6
 configure	+= --enable-isisd
 configure	+= --enable-watchquagga
-configure	+= --enable-watchlink
+configure	+= --disable-watchlink
 configure	+= --enable-opaque-lsa
 configure	+= --enable-ospfclient=yes
 configure	+= --enable-ospfapi=yes
diff --git a/debian/vyatta-quagga.init.d b/debian/vyatta-quagga.init.d
index 0bf2eaab..4e342f8b 100644
--- a/debian/vyatta-quagga.init.d
+++ b/debian/vyatta-quagga.init.d
@@ -32,7 +32,6 @@ for dir in $pid_dir $log_dir ; do
 done
 
 declare -a common_args=( -d -P 0 )
-declare -a watchlink_args=( -s -d -i $pid_dir/watchlink.pid )
 declare -a zebra_args=( ${common_args[@]} -l -s 1048576 -i $pid_dir/zebra.pid )
 declare -a ripd_args=( ${common_args[@]} -i $pid_dir/ripd.pid )
 declare -a ripngd_args=( ${common_args[@]} -i $pid_dir/ripngd.pid )
@@ -47,7 +46,6 @@ vyatta_quagga_start ()
     if [ $# -gt 0 ] ; then
 	daemons=( $* )
     else
-	daemons+=( watchlink )
 	daemons+=( zebra )
 	daemons+=( ripd )
 #	daemons+=( ripngd )
@@ -81,7 +79,7 @@ vyatta_quagga_stop ()
     if [ $# -gt 0 ] ; then
 	daemons=( $* )
     else
-	daemons=( watchlink bgpd isisd ospf6d ospfd ripngd ripd zebra )
+	daemons=( bgpd isisd ospf6d ospfd ripngd ripd zebra )
     fi
     log_action_begin_msg "Stopping Quagga"
     for daemon in ${daemons[@]} ; do
-- 
cgit v1.2.3