Patchwork [1/4] qemuimage-testlib: silence some key warnings

login
register
mail settings
Submitter Ross Burton
Date April 5, 2013, 3:35 p.m.
Message ID <1365176132-17102-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/47501/
State Accepted
Commit 4b5001de2f5303523e0b40fa30484f37c7c48564
Headers show

Comments

Ross Burton - April 5, 2013, 3:35 p.m.
Set StrictHostKeyChecking to no to silence the fingerprint warnings, and instead
of creating a temporary file for the known hosts and then deleting it just use
/dev/null.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 scripts/qemuimage-testlib |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Patch

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 22e2d41..daa1ac0 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -84,13 +84,12 @@  Test_SCP()
 	local ip_addr=$1
 	local src=$2
 	local des=$3
-	local tmpfile=`mktemp`
 	local time_out=60
 	local ret=0
 
 	# We use expect to interactive with target by ssh
 	local exp_cmd=`cat << EOF
-eval spawn scp -o UserKnownHostsFile=$tmpfile "$src" root@$ip_addr:"$des"
+eval spawn scp -o UserKnownHostsFile=/dev/null  -o StrictHostKeyChecking=no "$src" root@$ip_addr:"$des"
 set timeout $time_out
 expect {
     "*assword:" { send "\r"; exp_continue}
@@ -107,7 +106,6 @@  EOF`
 
 	expect -c "$exp_cmd"
 	ret=$?
-	rm -rf $tmpfile
 	return $ret
 }
 
@@ -117,11 +115,10 @@  Test_SSH()
 	local ip_addr=$1
 	shift
 	local command=$@
-	local tmpfile=`mktemp`
 	local time_out=60
 	local ret=0
 	local exp_cmd=`cat << EOF
-eval spawn ssh -o UserKnownHostsFile=$tmpfile root@$ip_addr "$command"
+eval spawn ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@$ip_addr "$command"
 set timeout $time_out
 expect {
     "*assword:" { send "\r"; exp_continue}
@@ -138,7 +135,6 @@  EOF`
 
 	expect -c "$exp_cmd"
 	ret=$?
-	rm -rf $tmpfile
 	return $ret
 }