diff options
| author | Rick Balocca <rbalocca@vyatta.com> | 2008-11-11 16:17:31 -0800 |
|---|---|---|
| committer | Rick Balocca <rbalocca@vyatta.com> | 2008-11-11 16:17:31 -0800 |
| commit | 336ac34391efd20648ef710b953fa94d0551f299 (patch) | |
| tree | 7e8eca96adf3ffd183e901103989316642b3adba | |
| parent | 2944ef32dc0bc7113e0e516f154e4bdd527895d2 (diff) | |
| parent | 91de1b9fc321f4488c32aab6ba350272289508e7 (diff) | |
| download | vyatta-cfg-quagga-336ac34391efd20648ef710b953fa94d0551f299.tar.gz vyatta-cfg-quagga-336ac34391efd20648ef710b953fa94d0551f299.zip | |
Merge branch 'islavista' into jenner
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 2 | ||||
| -rwxr-xr-x | scripts/install-system | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index c4f43586..dff04293 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -61,7 +61,7 @@ Cmnd_Alias ETHTOOL = /usr/sbin/ethtool -p *, \ /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 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, \ PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, /usr/bin/lsof diff --git a/scripts/install-system b/scripts/install-system index 1f507fe9..bb1c4385 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -24,7 +24,12 @@ # # Vyatta system installer script. # -# + +if [ `whoami` != 'root' ] ; then + echo "This script must be run with root privileges." + exit 1 +fi + # If you set VYATTA_AUTO_INSTALL I will try to do an automated install for you if [ -e /etc/default/vyatta ] ; then @@ -841,7 +846,7 @@ copy_config () { set_encrypted_password() { sed -i \ - -e "/ user $1 {/,/}/s/encrypted-password .*\$/encrypted-password \"$2\"/" $3 + -e "/ user $1 {/,/}/s/encrypted-password.*\$/encrypted-password \"$2\"/" $3 } change_password() { |