diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-07 09:55:14 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-07 09:55:14 -0700 |
| commit | 4c2f025d3d15d3044cd4cc236ec4a1543202b859 (patch) | |
| tree | 6c7b1f76e5d58f6f4bf39e1e153e433c2b43245e | |
| parent | aa072d412b45aab5177c1d6fcfc574014bbfd57e (diff) | |
| parent | 485e44216f957ef5f54412bd5171011c2102153a (diff) | |
| download | quagga-4c2f025d3d15d3044cd4cc236ec4a1543202b859.tar.bz2 quagga-4c2f025d3d15d3044cd4cc236ec4a1543202b859.tar.xz | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-quagga into jenner
Conflicts:
debian/vyatta-quagga.init.d
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rwxr-xr-x | debian/vyatta-quagga.init.d | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6d868285..ee9054fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +vyatta-quagga (0.99.11-16) unstable; urgency=low + + [ Stephen Hemminger ] + * Only start zebra as part of initial boot + + [ Chris Caputo ] + * Compiler warning fixes for when --enable-snmp is configured. + * Fix "show ip bgp dampened-paths" garbage output. + + [ Joakim Tjernlund ] + * Don't delete too many routes. + + [ Chris Caputo ] + * 64-bit fix for lib/smux.h SNMP_INTEGER() macro + + [ Stephen Hemminger ] + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Wed, 06 May 2009 15:35:39 -0700 + vyatta-quagga (0.99.11-15) unstable; urgency=low [ Denis Ovsienko ] diff --git a/debian/vyatta-quagga.init.d b/debian/vyatta-quagga.init.d index 454aba20..b4bc3c81 100755 --- a/debian/vyatta-quagga.init.d +++ b/debian/vyatta-quagga.init.d @@ -37,10 +37,11 @@ vyatta_quagga_start () if [ $# -gt 0 ] ; then daemons=( $* ) else + # Only start zebra daemons=( zebra ) fi - log_daemon_msg "Starting routing services" + log_daemon_msg "Starting routing manager" for daemon in ${daemons[@]} ; do log_progress_msg "$daemon" /opt/vyatta/sbin/quagga-manager start $daemon || \ |