diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2009-03-08 17:48:22 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2009-03-08 17:48:22 -0700 |
| commit | 6deaa01bb20404bb82d4b8233699ba352c05bfd1 (patch) | |
| tree | 69c846a353101d0ee352bee8bd82173033623253 | |
| parent | a64dfc6524f0d59f4c7c0df4d2d6d30679791909 (diff) | |
| parent | c1ff68d85ad69606db7834abea64cee1e775371d (diff) | |
| download | vyatta-cfg-quagga-6deaa01bb20404bb82d4b8233699ba352c05bfd1.tar.gz vyatta-cfg-quagga-6deaa01bb20404bb82d4b8233699ba352c05bfd1.zip | |
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-system into jenner
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 29912c1c..0ee0f793 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +vyatta-cfg-system (0.15.3-11) unstable; urgency=low + + [ Stig Thormodsrud ] + * Remove prefix mask on vip if present since it can't be using in + arping. + + [ Stephen Hemminger ] + * Fix path to lsof + + -- An-Cheng Huang <ancheng@vyatta.com> Sat, 07 Mar 2009 23:25:55 -0800 + vyatta-cfg-system (0.15.3-10) unstable; urgency=low [ Stephen Hemminger ] diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index c988312d..59b43d13 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -76,7 +76,7 @@ Cmnd_Alias ETHTOOL = /usr/sbin/ethtool -p *, \ /usr/sbin/ethtool -a *, \ /usr/sbin/ethtool -c *, \ /usr/sbin/ethtool -i * -Cmnd_Alias DISK = /sbin/lsof, /sbin/fdisk -l *, /sbin/sfdisk -d * +Cmnd_Alias DISK = /usr/bin/lsof, /sbin/fdisk -l *, /sbin/sfdisk -d * Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff, /usr/sbin/pppstats Cmnd_Alias PCAPTURE = /usr/bin/tshark, /usr/bin/tcpdump |