Repository: cloudstack Updated Branches: refs/heads/master 6dd30eaf1 -> a72f14ea9
Ensure the response is a proper http response. Tested that cloud-set-guest-password.sh still works after this change. Reviewed-by: Daan Hoogland <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a72f14ea Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a72f14ea Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a72f14ea Branch: refs/heads/master Commit: a72f14ea9cb832faaac946b3cf9f56856b50142a Parents: 6dd30ea Author: Hugo Trippaers <[email protected]> Authored: Tue Dec 2 16:26:10 2014 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Dec 2 16:36:49 2014 +0100 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a72f14ea/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh b/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh index a3a2732..294eab0 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh +++ b/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh @@ -48,7 +48,7 @@ replace_in_file() { get_value() { local filename=$1 local keyname=$2 - grep -i $keyname= $filename | cut -d= -f2 + grep -i "^$keyname=" $filename | cut -d= -f2 } ip=$1 @@ -70,7 +70,7 @@ do fi done -# echo -e \"\\\"HTTP/1.0 200 OK\\\nDocumentType: text/plain\\\n\\\n\\\"\"; +echo -ne "HTTP/1.0 200 OK\r\nDocumentType: text/plain\r\n\r\n" if [ "$request" == "send_my_password" ] then @@ -98,6 +98,4 @@ else fi fi -# echo -e \"\\\"\\\n\\\"\" - unlock_exit 0 $lock $locked
