diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-12-12 14:34:54 -0800 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-12-12 14:34:54 -0800 |
| commit | 7d451abcc956ce92c6c6dfd6286757ce9da2aaa6 (patch) | |
| tree | 40bb5624910248ea15479d6034257e1b09ae791a /scripts/install/install-functions | |
| parent | 802f4e507d877a8354bf3c504e3c24c135201d93 (diff) | |
| download | vyatta-cfg-system-7d451abcc956ce92c6c6dfd6286757ce9da2aaa6.tar.gz vyatta-cfg-system-7d451abcc956ce92c6c6dfd6286757ce9da2aaa6.zip | |
revert 918bd40d3e3f238a800b1486f70e2d5ee1d71a72
Diffstat (limited to 'scripts/install/install-functions')
| -rwxr-xr-x | scripts/install/install-functions | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 34ced705..0c2210fb 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -236,7 +236,7 @@ change_password() { local pwd1="1" local pwd2="2" - until [[ "$pwd1" == "$pwd2" && "$pwd1" != "vyatta" ]]; do + until [[ "$pwd1" == "$pwd2" ]]; do read -p "Enter password for user '$user':" -r -s pwd1 <>/dev/tty 2>&0 echo if [[ "$pwd1" == "" ]]; then @@ -248,12 +248,7 @@ change_password() { if [ "$pwd1" != "$pwd2" ]; then echo "Passwords do not match" - continue fi - if [[ "$pwd1" == "vyatta" ]]; then - echo "'vyatta' is not a vaild password" - continue - fi done # escape any slashes in resulting password |