[Fusionforge-commits] r10995 - in trunk/tests: openvz scripts

Christian Bayle cbayle at libremir.placard.fr.eu.org
Thu Oct 14 19:25:10 CEST 2010


Author: cbayle
Date: 2010-10-14 19:25:09 +0200 (Thu, 14 Oct 2010)
New Revision: 10995

Modified:
   trunk/tests/openvz/Makefile
   trunk/tests/scripts/start_vz.sh
Log:
Set hostname differently


Modified: trunk/tests/openvz/Makefile
===================================================================
--- trunk/tests/openvz/Makefile	2010-10-14 17:08:56 UTC (rev 10994)
+++ trunk/tests/openvz/Makefile	2010-10-14 17:25:09 UTC (rev 10995)
@@ -54,9 +54,10 @@
 	#ln -sf /usr/share/zoneinfo/Europe/Paris $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/localtime
 	# Remove hostname
 	[ ! -f $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/hostname ] || rm $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/hostname
-	grep -q debian6.local $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/hosts || \
-		sed -i -e 's/localhost/debian6.local localhost/' $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/hosts
-	echo "debian6.local" > $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/hostname
+	## NOW uses vzctl set $(VEIDDEBTEMP) --hostname command
+	##grep -q debian6.local $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/hosts || \
+	##	sed -i -e 's/localhost/debian6.local localhost/' $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/hosts
+	##echo "debian6.local" > $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/hostname
 	#
 	[ -c $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/dev/ptmx ] || chroot $(VZPRIVATEDIR)/$(VEIDDEBTEMP) /bin/mknod /dev/ptmx c 5 2
 	mkdir $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/root/.ssh
@@ -79,10 +80,10 @@
 	#ln -sf /usr/share/zoneinfo/Europe/Paris $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/localtime
 	# Remove hostname
 	[ ! -f $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/hostname ] || rm $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/hostname
-	# Didn't find a better way to make so hostname -f replies something proper
-	echo "127.0.0.1 centos5.local localhost.localdomain localhost" > $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/hosts
-	echo "centos5.local" > $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/hostname
-	echo "HOSTNAME=centos5.local" >> $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/sysconfig/network
+	## NOW uses vzctl set $(VEIDCENTEMP) --hostname command
+	##echo "127.0.0.1 centos5.local localhost.localdomain localhost" > $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/hosts
+	##echo "centos5.local" > $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/hostname
+	##echo "HOSTNAME=centos5.local" >> $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/sysconfig/network
 	#
 	[ -c $(VZPRIVATEDIR)/$(VEIDCENTEMP)/dev/ptmx ]     || chroot $(VZPRIVATEDIR)/$(VEIDCENTEMP) /bin/mknod /dev/ptmx c 5 2
 	[ -d $(VZPRIVATEDIR)/$(VEIDCENTEMP)/dev/pts ]      || chroot $(VZPRIVATEDIR)/$(VEIDCENTEMP) /bin/mkdir /dev/pts

Modified: trunk/tests/scripts/start_vz.sh
===================================================================
--- trunk/tests/scripts/start_vz.sh	2010-10-14 17:08:56 UTC (rev 10994)
+++ trunk/tests/scripts/start_vz.sh	2010-10-14 17:25:09 UTC (rev 10995)
@@ -11,6 +11,7 @@
 	sudo /usr/sbin/vzctl start $VEID
 	VZHOST=$IPBASE.$VEID
 	export VZHOST
+	sudo /usr/sbin/vzctl set $VEID --hostname $HOST --save
 	sudo /usr/sbin/vzctl set $VEID --ipadd $IPBASE.$VEID --save
         sudo /usr/sbin/vzctl set $VEID --nameserver $IPDNS --save
 fi




More information about the Fusionforge-commits mailing list