summaryrefslogtreecommitdiff
path: root/scripts/install/install-functions
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/install/install-functions')
-rwxr-xr-xscripts/install/install-functions7
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