diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-04-18 11:03:04 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-04-18 11:03:04 -0700 |
| commit | 0b0277386bb329d16b243d9948edb81f35ce4f31 (patch) | |
| tree | 941e111bd7bbe584cbeb208a375df5067b2e8f82 | |
| parent | 09d3fdd15c9bf316127f13a9322fdbea13a2628c (diff) | |
| download | quagga-0b0277386bb329d16b243d9948edb81f35ce4f31.tar.bz2 quagga-0b0277386bb329d16b243d9948edb81f35ce4f31.tar.xz | |
go back to building watchlink
Revert "Disable watchlink from the build"
This reverts commit 09d3fdd15c9bf316127f13a9322fdbea13a2628c.
| -rw-r--r-- | debian/lintian | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/vyatta-quagga.init.d | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/debian/lintian b/debian/lintian index 08d952e9..8368204a 100644 --- a/debian/lintian +++ b/debian/lintian @@ -1,2 +1,3 @@ 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 9f82468e..7681bcb3 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ configure += --enable-vtysh configure += --enable-ipv6 configure += --enable-isisd configure += --enable-watchquagga -configure += --disable-watchlink +configure += --enable-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 4e342f8b..0bf2eaab 100644 --- a/debian/vyatta-quagga.init.d +++ b/debian/vyatta-quagga.init.d @@ -32,6 +32,7 @@ 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 ) @@ -46,6 +47,7 @@ vyatta_quagga_start () if [ $# -gt 0 ] ; then daemons=( $* ) else + daemons+=( watchlink ) daemons+=( zebra ) daemons+=( ripd ) # daemons+=( ripngd ) @@ -79,7 +81,7 @@ vyatta_quagga_stop () if [ $# -gt 0 ] ; then daemons=( $* ) else - daemons=( bgpd isisd ospf6d ospfd ripngd ripd zebra ) + daemons=( watchlink bgpd isisd ospf6d ospfd ripngd ripd zebra ) fi log_action_begin_msg "Stopping Quagga" for daemon in ${daemons[@]} ; do |