From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 7 Feb 2011 23:15:42 +0000 (-0500)
Subject: print out only ssh key if it was generated automatically.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=38e2f4538f8651e9eedef55cc678b947f4bfa4ba;p=xentesttools%2Fbootstrap.git

print out only ssh key if it was generated automatically.
---

diff --git a/root_image/tools/ssh_support/sshd_server b/root_image/tools/ssh_support/sshd_server
index 15c002a..40ee630 100755
--- a/root_image/tools/ssh_support/sshd_server
+++ b/root_image/tools/ssh_support/sshd_server
@@ -181,7 +181,9 @@ start_ssh()
 			echo "    SSH started [$sshd_pid]"
 		fi
 		echo ''
-		echo "        passwd = $new_root_passwd"
+		if [ -z "$DEVELOPER_FIXED_SSH_PASSWD" ]; then
+			echo "        passwd = $new_root_passwd"
+		fi
 	else
 		do_stop_ssh