[Fusionforge-commits] r12528 - in trunk/tests: lxc scripts

Christian Bayle cbayle at fusionforge.org
Wed Mar 2 12:56:48 CET 2011


Author: cbayle
Date: 2011-03-02 12:56:47 +0100 (Wed, 02 Mar 2011)
New Revision: 12528

Modified:
   trunk/tests/lxc/lxc-debian6.postinst
   trunk/tests/scripts/start_lxc.sh
Log:
hostname if fqdn


Modified: trunk/tests/lxc/lxc-debian6.postinst
===================================================================
--- trunk/tests/lxc/lxc-debian6.postinst	2011-03-02 11:21:02 UTC (rev 12527)
+++ trunk/tests/lxc/lxc-debian6.postinst	2011-03-02 11:56:47 UTC (rev 12528)
@@ -25,7 +25,7 @@
 
 EOF
 		cat <<EOF >> $rootfs/etc/hosts
-$address	$hostname.local $hostname
+$address	$hostname
 EOF
 	else
 		exit 2

Modified: trunk/tests/scripts/start_lxc.sh
===================================================================
--- trunk/tests/scripts/start_lxc.sh	2011-03-02 11:21:02 UTC (rev 12527)
+++ trunk/tests/scripts/start_lxc.sh	2011-03-02 11:56:47 UTC (rev 12528)
@@ -25,7 +25,7 @@
 sudo /usr/lib/lxc/templates/lxc-$LXCDEBTEMPLATE.postinst -p /var/lib/lxc/$HOST -n $HOST --address=$IPDEBBASE.$VEIDDEB --netmask=$IPDEBMASK --gateway=$IPDEBGW --pubkey=$SSHPUBKEY --hostkeydir=$HOSTKEYDIR
 sudo /usr/bin/lxc-start -n $HOST -d
 
-ssh -o 'StrictHostKeyChecking=no' "root@$HOST.local" uname -a
+ssh -o 'StrictHostKeyChecking=no' "root@$HOST" uname -a
 ret=$?
 for loop in 1 2 3 4 5 6 7 8 9
 do
@@ -33,7 +33,7 @@
 	if [ $ret -ne 0 ];then
 		echo -n $loop
 		sleep 10;
-		ssh -o 'StrictHostKeyChecking=no' "root@$HOST.local" uname -a
+		ssh -o 'StrictHostKeyChecking=no' "root@$HOST" uname -a
 		ret=$?
 	fi
 done




More information about the Fusionforge-commits mailing list