diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2008-10-29 16:46:58 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2008-10-29 16:46:58 -0700 |
| commit | 81bd193daacbf4b1f3ee74fe940151ac90174870 (patch) | |
| tree | c01784e8b4ffde58803ed3cc7d0c9ab80876bd8e /debian | |
| parent | fea9248fdbe724e7e44b65e298a3f3290ba1b767 (diff) | |
| parent | 21b96894a7ad4e44838312668429cc5c670ee55b (diff) | |
| download | vyatta-cfg-system-81bd193daacbf4b1f3ee74fe940151ac90174870.tar.gz vyatta-cfg-system-81bd193daacbf4b1f3ee74fe940151ac90174870.zip | |
Merge branch 'islavista' of http://git.vyatta.com/vyatta-cfg-system into islavista
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 21d7ff32..a814df9c 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -55,11 +55,15 @@ Cmnd_Alias IPFLUSH = /sbin/ip route flush cache, \ /sbin/ip route flush cache *,\ /sbin/ip neigh flush to *, \ /sbin/ip neigh flush dev * -Cmnd_Alias ETHTOOLP = /usr/sbin/ethtool -p * +Cmnd_Alias ETHTOOL = /usr/sbin/ethtool -p *, \ + /usr/sbin/ethtool -S *, \ + /usr/sbin/ethtool -a *, \ + /usr/sbin/ethtool -c *, \ + /usr/sbin/ethtool -i * Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff Cmnd_Alias PCAPTURE = /usr/bin/tshark, /usr/bin/tcpdump -%operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOLP, IPFLUSH, \ +%operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOL, IPFLUSH, \ PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, /usr/bin/lsof EOF cat <<EOF >>/etc/sudoers @@ -118,6 +122,15 @@ if [ -e /etc/default/mdadm ]; then sed -i 's+^DAEMON_OPTIONS=.*$+DAEMON_OPTIONS="--syslog --program /opt/vyatta/sbin/vyatta-raid-event"+' /etc/default/mdadm fi +# --following is added to resolve issues related to bug 3567 on upgrade from hollywood to islavista-- +# back-up existing /etc/syslog.conf file in hollywood which might be broken +# and replace it with the default syslog.conf in islavista. when system restarts +# after upgrade, whatever is configured in CLI will be written to syslog.conf +# + +cp -p /etc/syslog.conf /etc/syslog.conf.bak +cp -f /opt/vyatta/etc/syslog.conf /etc/syslog.conf + # Local Variables: # mode: shell-script # sh-indentation: 4 |