diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-12 11:34:54 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-12 11:34:54 -0700 |
| commit | f384ea4adbf0ab4aa5e8c70241392aa3cfa1e678 (patch) | |
| tree | f5434c9f8d2291f5383d18a89db4f3272198f54a | |
| parent | 019c42ca0d37f7a25d67843affeb3c099091d50a (diff) | |
| parent | 5ba6d58ff687409ce5ff561d6557a11de9aef6b6 (diff) | |
| download | quagga-f384ea4adbf0ab4aa5e8c70241392aa3cfa1e678.tar.bz2 quagga-f384ea4adbf0ab4aa5e8c70241392aa3cfa1e678.tar.xz | |
Merge branch 'glendale' of suva.vyatta.com:/git/vyatta-quagga into glendale
| -rw-r--r-- | debian/changelog | 27 | ||||
| -rw-r--r-- | debian/vyatta-quagga.prerm | 2 | ||||
| -rw-r--r-- | zebra/rt_netlink.c | 8 |
3 files changed, 36 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 47f69f29..8b1075c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +vyatta-quagga (0.99.9-9) unstable; urgency=low + + 3.0.5 + [ Mark O'Brien ] + + + [ An-Cheng Huang ] + * fix package upgrade problem caused by prerm script. + + [ Mark O'Brien ] + + -- Mark O'Brien <mobrien@vyatta.com> Tue, 06 May 2008 12:43:40 -0700 + +vyatta-quagga (0.99.9-8) unstable; urgency=low + + 3.0.4 + [ Mark O'Brien ] + + + [ Stephen Hemminger ] + * filter out all route change responses on listen socket + * quiet noisy errors from zebra + + [ Mark O'Brien ] + + -- Mark O'Brien <mobrien@vyatta.com> Mon, 05 May 2008 16:40:58 -0700 + vyatta-quagga (0.99.9-7) unstable; urgency=low 3.0.3 diff --git a/debian/vyatta-quagga.prerm b/debian/vyatta-quagga.prerm index 4794d342..69792d27 100644 --- a/debian/vyatta-quagga.prerm +++ b/debian/vyatta-quagga.prerm @@ -1 +1,3 @@ +#!/bin/sh + case "$1" in upgrade) exit 0;; esac diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 23262416..569dc807 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -418,7 +418,13 @@ netlink_parse_info (int (*filter) (struct sockaddr_nl *, struct nlmsghdr *), if (nl == &netlink_cmd && (-errnum == ENODEV || -errnum == ESRCH) && (msg_type == RTM_NEWROUTE || msg_type == RTM_DELROUTE)) - loglvl = LOG_DEBUG; + { + /* These errors are normal during link transistion */ + if (IS_ZEBRA_DEBUG_KERNEL) + loglvl = LOG_DEBUG; + else + return -1; + } zlog (NULL, loglvl, "%s error: %s, type=%s(%u), " "seq=%u, pid=%u", |