Merge branch 'islavista' into jenner

Conflicts:

	scripts/standalone_root_pw_reset

4 files changed, 11 insertions, 7 deletions

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index e9541dbe..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
diff --git a/scripts/install-system b/scripts/install-system
index 23109bea..2ac202f2 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -839,7 +839,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() {
diff --git a/scripts/standalone_root_pw_reset b/scripts/standalone_root_pw_reset
index 8322f9d0..0750746d 100755
--- a/scripts/standalone_root_pw_reset
+++ b/scripts/standalone_root_pw_reset
@@ -27,7 +27,7 @@ CF=/opt/vyatta/etc/config/config.boot
 ADMIN=vyatta
 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() {
@@ -37,9 +37,9 @@ change_password() {
 
     until [ "$pwd1" == "$pwd2" ]
     do
-        read -p "Enter $user password:" -r -s pwd1 <>/dev/tty 2>&0
+        read -p "Enter $user password: " -r -s pwd1
 	echo
-	read -p "Retype $user password:" -r -s pwd2 <>/dev/tty 2>&0
+	read -p "Retype $user password: " -r -s pwd2
 	echo
 
 	if [ "$pwd1" != "$pwd2" ]
diff --git a/scripts/system/vyatta_update_login.pl b/scripts/system/vyatta_update_login.pl
index dbe4e338..1f71434b 100755
--- a/scripts/system/vyatta_update_login.pl
+++ b/scripts/system/vyatta_update_login.pl
@@ -53,7 +53,7 @@ my %reasons = (
 
 # Map of level to additional groups
 my %level_map = (
-    'admin'    => [ 'quaggavty', 'vyattacfg', 'sudo', 'adm', 'dip', ],
+    'admin'    => [ 'quaggavty', 'vyattacfg', 'sudo', 'adm', 'dip', 'disk'],
     'operator' => [ 'quaggavty', 'operator',  'adm', 'dip', ],
 );