From b12adbc316c23b76ffff1ccdc6b6d889e9b99abc Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Wed, 17 Jun 2009 16:23:35 -0700 Subject: Merged from Jenner. --- debian/vyatta-cfg-system.postinst.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'debian/vyatta-cfg-system.postinst.in') 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 -- cgit v1.2.3