summaryrefslogtreecommitdiff
path: root/scripts/install-system
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2012-12-12 14:34:54 -0800
committerJohn Southworth <john.southworth@vyatta.com>2012-12-12 14:34:54 -0800
commit7d451abcc956ce92c6c6dfd6286757ce9da2aaa6 (patch)
tree40bb5624910248ea15479d6034257e1b09ae791a /scripts/install-system
parent802f4e507d877a8354bf3c504e3c24c135201d93 (diff)
downloadvyatta-cfg-system-7d451abcc956ce92c6c6dfd6286757ce9da2aaa6.tar.gz
vyatta-cfg-system-7d451abcc956ce92c6c6dfd6286757ce9da2aaa6.zip
revert 918bd40d3e3f238a800b1486f70e2d5ee1d71a72
Diffstat (limited to 'scripts/install-system')
-rwxr-xr-xscripts/install-system8
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