[Fusionforge-commits] r12442 - trunk/tests/lxc

Christian Bayle cbayle at fusionforge.org
Mon Feb 28 22:04:24 CET 2011


Author: cbayle
Date: 2011-02-28 22:04:23 +0100 (Mon, 28 Feb 2011)
New Revision: 12442

Modified:
   trunk/tests/lxc/Makefile
Log:
Review again cgroup mount logic


Modified: trunk/tests/lxc/Makefile
===================================================================
--- trunk/tests/lxc/Makefile	2011-02-28 20:44:42 UTC (rev 12441)
+++ trunk/tests/lxc/Makefile	2011-02-28 21:04:23 UTC (rev 12442)
@@ -8,17 +8,15 @@
 default: vmdebian6-config netstaticdeb installkey
 	@echo "read the Makefile to see available targets"
 
-/cgroup/tasks: beroot mountcgroup
-
 /cgroup: beroot
 	mkdir /cgroup
 
+checkmount: checkfstab /cgroup
+	grep -q 0 /cgroup/cpuset.cpu || mount /cgroup
+
 checkfstab:
 	grep ^cgroup /etc/fstab || (echo "You need to add cgroup entry to fstab \"cgroup        /cgroup        cgroup        defaults    0    0\"" && false)
 
-mountcgroup: beroot /cgroup checkfstab
-	mount /cgroup
-
 /var/lib/lxc/vmdebian6: beroot /usr/bin/lxc-info bridging
 	mkdir $@
 	LANG=C MIRROR=$(DEBMIRROR) SUITE=$(DIST) ./lxc-debian6 -p $@




More information about the Fusionforge-commits mailing list