[Fusionforge-commits] r10997 - trunk/tests/openvz

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Thu Oct 14 19:27:13 CEST 2010


Author: aljeux
Date: 2010-10-14 19:27:13 +0200 (Thu, 14 Oct 2010)
New Revision: 10997

Modified:
   trunk/tests/openvz/Makefile
Log:
Allow overwrite location of ssh public key when creating a template (tests/openvz)

Modified: trunk/tests/openvz/Makefile
===================================================================
--- trunk/tests/openvz/Makefile	2010-10-14 17:26:59 UTC (rev 10996)
+++ trunk/tests/openvz/Makefile	2010-10-14 17:27:13 UTC (rev 10997)
@@ -11,6 +11,7 @@
 VZCTL=/usr/sbin/vzctl
 DEBOOTSTRAP=/usr/sbin/debootstrap
 RINSE=extrapackage="$(EXTRACENTOSPACKAGE)" /usr/sbin/rinse
+SSHPUBKEY=~$(USERCLIENT)/.ssh/id_rsa.pub
 
 # Default config
 include config.default
@@ -60,8 +61,8 @@
 	##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
-	cp ~$(USERCLIENT)/.ssh/id_rsa.pub $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/root/.ssh/authorized_keys
+	mkdir -p $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/root/.ssh
+	cp $(SSHPUBKEY) $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/root/.ssh/authorized_keys
 	cp ssh/ssh_host_* $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/etc/ssh/
 	cd $(VZPRIVATEDIR)/$(VEIDDEBTEMP)/ ; tar --numeric-owner -zcf $(VZTEMPLATEDIR)/cache/debian-$(DEBVERS)-$(ARCH)-minimal.tar.gz .
 
@@ -100,7 +101,7 @@
 	grep -q devpts $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/fstab || \
 		echo "none /dev/pts devpts mode=0620 0 0" >> $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/fstab
 	mkdir $(VZPRIVATEDIR)/$(VEIDCENTEMP)/root/.ssh
-	cp ~$(USERCLIENT)/.ssh/id_rsa.pub $(VZPRIVATEDIR)/$(VEIDCENTEMP)/root/.ssh/authorized_keys
+	cp $(SSHPUBKEY) $(VZPRIVATEDIR)/$(VEIDCENTEMP)/root/.ssh/authorized_keys
 	cp ssh/ssh_host_* $(VZPRIVATEDIR)/$(VEIDCENTEMP)/etc/ssh/
 	cd $(VZPRIVATEDIR)/$(VEIDCENTEMP)/ ; tar --numeric-owner -zcf $(VZTEMPLATEDIR)/cache/centos-$(CENTVERS)-$(ARCH)-minimal.tar.gz .
 




More information about the Fusionforge-commits mailing list