diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-12-12 14:34:54 -0800 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2013-01-23 08:49:58 -0800 |
| commit | 38f67d8d7a43b730844e9565e35ba199fd11cb9c (patch) | |
| tree | 3f1e32e6650ec807b6540c8f9796a2045e5baca7 /scripts/install-system | |
| parent | 587690ca3113011815dc91a792bbc7103943e260 (diff) | |
| download | vyatta-cfg-system-38f67d8d7a43b730844e9565e35ba199fd11cb9c.tar.gz vyatta-cfg-system-38f67d8d7a43b730844e9565e35ba199fd11cb9c.zip | |
revert 918bd40d3e3f238a800b1486f70e2d5ee1d71a72
Diffstat (limited to 'scripts/install-system')
| -rwxr-xr-x | scripts/install-system | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/install-system b/scripts/install-system index 80e58f6c..5dd06256 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -1094,7 +1094,7 @@ change_password() { local pwd1="1" local pwd2="2" - until [[ "$pwd1" == "$pwd2" && "$pwd1" != "vyatta" ]] + until [[ "$pwd1" == "$pwd2" ]] do read -p "Enter password for user '$user': " -r -s pwd1 <>/dev/tty 2>&0 echo @@ -1108,12 +1108,6 @@ change_password() { if [ "$pwd1" != "$pwd2" ] then echo "Passwords do not match" - continue - fi - if [ "$pwd1" == "vyatta" ] - then - echo "'vyatta' is not a valid password" - continue fi done |