diff options
author | Rick Balocca <rbalocca@vyatta.com> | 2008-10-30 14:44:57 -0700 |
---|---|---|
committer | Rick Balocca <rbalocca@vyatta.com> | 2008-10-30 14:44:57 -0700 |
commit | 760b722ba1cb9d1f69e0753e13e2002611c3033e (patch) | |
tree | ef688d4d9144e5955c595bbafc8b9361792a74c1 /scripts/standalone_root_pw_reset | |
parent | 841e41f385ca960fb703ff612b014d7e57560b3e (diff) | |
parent | 81bd193daacbf4b1f3ee74fe940151ac90174870 (diff) | |
download | vyatta-cfg-system-760b722ba1cb9d1f69e0753e13e2002611c3033e.tar.gz vyatta-cfg-system-760b722ba1cb9d1f69e0753e13e2002611c3033e.zip |
Merge branch 'islavista' into jenner
Conflicts:
scripts/standalone_root_pw_reset
Diffstat (limited to 'scripts/standalone_root_pw_reset')
-rwxr-xr-x | scripts/standalone_root_pw_reset | 6 |
1 files changed, 3 insertions, 3 deletions
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" ] |