summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2009-06-17 16:23:35 -0700
committerBob Gilligan <gilligan@vyatta.com>2009-06-17 16:23:35 -0700
commitb12adbc316c23b76ffff1ccdc6b6d889e9b99abc (patch)
treed219331d4cc896ca26cd9448d5dd27beb28c9f07 /debian
parenta8b7b384291d13c4d12316c28bc727caae0541e9 (diff)
downloadvyatta-cfg-system-b12adbc316c23b76ffff1ccdc6b6d889e9b99abc.tar.gz
vyatta-cfg-system-b12adbc316c23b76ffff1ccdc6b6d889e9b99abc.zip
Merged from Jenner.
Diffstat (limited to 'debian')
-rw-r--r--debian/vyatta-cfg-system.postinst.in11
1 files changed, 4 insertions, 7 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index ec159432..38757106 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -83,7 +83,8 @@ 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
-%operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOL, IPFLUSH, \
+Cmnd_Alias HWINFO = /usr/bin/lspci
+%operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOL, IPFLUSH, HWINFO, \
PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, \
DISK, CONNTRACK, IP6TABLES
EOF
@@ -106,12 +107,8 @@ EOF
fi
done
- # replace debian /etc/ntp.conf with Vyatta version
- cp $sysconfdir/ntp.conf /etc/ntp.conf
-
- # remove debian rules that use /etc/network/interfaces
- # to avoid warning about missing ifup (bug 3885)
- sed -i -e '/net.agent/s/^SUBSYSTEM/#&/' /etc/udev/rules.d/80-drivers.rules
+ # purge off ancient devfs stuff from /etc/securetty
+ cp $sysconfdir/securetty /etc/securetty
fi
# update crontab for logrotate