From 4149e49f808f6602e21bf51f82629fecb843e28c Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Wed, 12 Dec 2012 14:34:54 -0800
Subject: revert 918bd40d3e3f238a800b1486f70e2d5ee1d71a72

---
 scripts/install/install-functions | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'scripts/install/install-functions')

diff --git a/scripts/install/install-functions b/scripts/install/install-functions
index 99d39dc9..1929d1b3 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
-- 
cgit v1.2.3