summaryrefslogtreecommitdiff
path: root/scripts/install-system
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2012-09-25 10:16:57 -0700
committerJohn Southworth <john.southworth@vyatta.com>2012-09-25 10:16:57 -0700
commited7cdece4009646b7f2d67030c439108c3692485 (patch)
tree8274096d8283f885ff2373976d7af97f9b557523 /scripts/install-system
parent0aabbfdb8bf8b51eb774f385f1ec8da0c599a2b4 (diff)
parent647f7b50a80925bed700525aebd225ad59319cf4 (diff)
downloadvyatta-cfg-system-ed7cdece4009646b7f2d67030c439108c3692485.tar.gz
vyatta-cfg-system-ed7cdece4009646b7f2d67030c439108c3692485.zip
Bugfix 8290: Detect original unsalted password
Diffstat (limited to 'scripts/install-system')
-rwxr-xr-xscripts/install-system8
1 files changed, 6 insertions, 2 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" ]