From 85a164f6ac6d3210e4eaa59d03ab914bb408ffb1 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 21 Sep 2011 14:39:00 -0700 Subject: [PATCH] bug 11518: Return "saved_password" for non-existed password entry in domR To solve password file is destroyed along with restartNetwork command issue. If the password is not set in fact, user can use "ResetPassword" to try again. But it won't happen mostly, because it's only possible if the restartNetwork happened between user start up VM and set the new password. Reviewed-by: Keshav status 11518: resolved fixed --- .../systemvm/debian/config/opt/cloud/bin/serve_password.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh b/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh index 35fc08d680c..4724572cddc 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh @@ -74,7 +74,10 @@ then if [ "$password" == "" ] then logger -t cloud "serve_password sent bad_request to $ip." - echo "bad_request" + # echo "bad_request" + # Return "saved_password" for non-existed entry, to make it + # work if domR was once destroyed. + echo "saved_password" else logger -t cloud "serve_password sent a password to $ip." echo $password