Setting tag bootmanager-5.2-1

merged the branches for vserver and lxc
requires the rest of 5.2 - notably 'virt' in GetNodeFlavour
note that WriteModprobeConfig and MakeInitrd are turned off for lxc nodes
also note that fsck management for btrfs/lxc is still weak
vs_ROOT_SIZE=14G lxc_ROOT_SIZE=70G
vs_TOTAL_MINIMUM_DISK_SIZE=50G lxc_TOTAL_MINIMUM_DISK_SIZE=120G
expects ntpd to be turned on in the nodeimage

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 13f063f..5564c21 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -35,7 +35,7 @@ omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-11
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-25
 sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
 nodeconfig-GITPATH              := git://git.planet-lab.org/nodeconfig.git@master
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@master
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-1
 pypcilib-GITPATH                := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-11
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-16
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1

diff --git a/mlab-tags.mk b/mlab-tags.mk
index 38a3454..0ef4277 100644 (file)
--- a/mlab-tags.mk
+++ b/mlab-tags.mk
@@ -50,7 +50,7 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-25
 sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-7
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-24
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-1
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-11
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-16
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 80f6785..da18715 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -49,7 +49,7 @@ oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.1-25
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-9
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@master
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@master
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.2-1
 pypcilib-GITPATH                := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11
 pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-16
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.2-1

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 08503d0..2f010d0 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -47,7 +47,7 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-25
 sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-7
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-24
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-1
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-16
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1