From 7d451abcc956ce92c6c6dfd6286757ce9da2aaa6 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-system | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'scripts/install-system')

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
 
-- 
cgit v1.2.3