[Fusionforge-commits] r17323 - in branches/Branch_5_1: . tests/lxc

Roland Mas lolando at fusionforge.org
Thu May 23 15:45:18 CEST 2013


Author: lolando
Date: 2013-05-23 15:45:18 +0200 (Thu, 23 May 2013)
New Revision: 17323

Modified:
   branches/Branch_5_1/
   branches/Branch_5_1/tests/lxc/Makefile
Log:
Backport from master: Fix determination of where to store LXC templates on the buildbot

Modified: branches/Branch_5_1/tests/lxc/Makefile
===================================================================
--- branches/Branch_5_1/tests/lxc/Makefile	2013-05-23 13:40:24 UTC (rev 17322)
+++ branches/Branch_5_1/tests/lxc/Makefile	2013-05-23 13:45:18 UTC (rev 17323)
@@ -15,7 +15,7 @@
 checkfstab:
 	@grep ^cgroup /etc/fstab || (echo "You need to add cgroup entry to fstab 'cgroup /cgroup cgroup defaults 0 0'" && false)
 
-/usr/lib/lxc:
+/usr/share/lxc:
 	@[ -d $@ ] || sudo apt-get install lxc
 
 /usr/share/bridge-utils:
@@ -49,14 +49,14 @@
 delrights: beroot
 	lxc-setcap -d
 
-installtemplate: /usr/lib/lxc/templates/lxc-debian6 /usr/lib/lxc/templates/lxc-centos5
+installtemplate: /usr/share/lxc/templates/lxc-debian6 /usr/share/lxc/templates/lxc-centos5
 
-/usr/lib/lxc/templates/lxc-debian6: lxc-debian6 /usr/lib/lxc
-	cat lxc-debian6 | sed 's!http://cdn.debian.net/debian/!$(DEBMIRROR)!' > /usr/lib/lxc/templates/lxc-debian6
-	chmod 755 /usr/lib/lxc/templates/lxc-debian6
+/usr/share/lxc/templates/lxc-debian6: lxc-debian6 /usr/share/lxc
+	cat lxc-debian6 | sed 's!http://cdn.debian.net/debian/!$(DEBMIRROR)!' > /usr/share/lxc/templates/lxc-debian6
+	chmod 755 /usr/share/lxc/templates/lxc-debian6
 
-/usr/lib/lxc/templates/lxc-centos5: lxc-centos5 /usr/lib/lxc
-	cp lxc-centos5 /usr/lib/lxc/templates/
+/usr/share/lxc/templates/lxc-centos5: lxc-centos5 /usr/share/lxc
+	cp lxc-centos5 /usr/share/lxc/templates/
 
 createdeb:
 	sudo /usr/bin/lxc-create -n dhdebian6.local -f config.debian6 -t debian6




More information about the Fusionforge-commits mailing list