diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install-system | 8 | ||||
| -rwxr-xr-x | scripts/install/install-functions | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/scripts/install-system b/scripts/install-system index 860bdd1e..80e58f6c 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -1096,9 +1096,13 @@ change_password() { until [[ "$pwd1" == "$pwd2" && "$pwd1" != "vyatta" ]] do - read -p "Enter $user password:" -r -s pwd1 <>/dev/tty 2>&0 + read -p "Enter password for user '$user': " -r -s pwd1 <>/dev/tty 2>&0 echo - read -p "Retype $user password:" -r -s pwd2 <>/dev/tty 2>&0 + if [[ "$pwd1" == "" ]]; then + echo "'' is not a valid password" + continue + fi + read -p "Retype password for user '$user':" -r -s pwd2 <>/dev/tty 2>&0 echo if [ "$pwd1" != "$pwd2" ] diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 9290d88b..34ced705 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -237,9 +237,13 @@ change_password() { local pwd2="2" until [[ "$pwd1" == "$pwd2" && "$pwd1" != "vyatta" ]]; do - read -p "Enter $user password:" -r -s pwd1 <>/dev/tty 2>&0 + read -p "Enter password for user '$user':" -r -s pwd1 <>/dev/tty 2>&0 echo - read -p "Retype $user password:" -r -s pwd2 <>/dev/tty 2>&0 + if [[ "$pwd1" == "" ]]; then + echo "'' is not a valid password" + continue + fi + read -p "Retype password for user '$user':" -r -s pwd2 <>/dev/tty 2>&0 echo if [ "$pwd1" != "$pwd2" ]; then |