X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fconfiguration;h=cabf1893cd85fb12ed5ea43130963a473d154fc4;hb=d12ade7dd98cccdea3b1d3bfc3e65893de2390b0;hp=9f0fe74b6433a2182ef7b2d481c8bbd4cd54f503;hpb=4f606af034d26931e8546f0d0baed7bb85e32068;p=bootmanager.git

diff --git a/source/configuration b/source/configuration
index 9f0fe74..cabf189 100644
--- a/source/configuration
+++ b/source/configuration
@@ -4,7 +4,7 @@
 
 
 # the current version of the bootmanager
-VERSION=3.2
+VERSION=5.3
 
 # this is the server to contact if we don't have a bootcd
 DEFAULT_BOOT_SERVER=boot.planet-lab.org
@@ -19,8 +19,8 @@ MONITOR_SERVER=monitor.planet-lab.org
 #UPLOAD_LOG_SCRIPT=/monitor/upload
 UPLOAD_LOG_SCRIPT=/boot/upload-bmlog.php
 
-# bootcd variables : use %(path)s for path relative to bootcd
-BOOTCD_VERSION_FILE='%(path)s/bootme/ID'
+# bootcd variables : use {path} for path relative to bootcd
+BOOTCD_VERSION_FILE='{path}/bootme/ID'
 SERVER_CERT_DIR=/tmp/source/cacert
 CACERT_NAME=cacert.pem
 
@@ -53,11 +53,12 @@ PLCONF_DIR=/etc/planetlab
 # this sets the size of the root logical volume,
 # after the root and swap has been created, remaining
 # goes to the vserver partition
-ROOT_SIZE=14G
+vs_ROOT_SIZE=14G
+lxc_ROOT_SIZE=12G
 
 
 # override the swap size
-SWAP_SIZE=1G
+SWAP_SIZE=4G
 
 
 # in raw disk mode, the size of /vservers
@@ -80,7 +81,8 @@ MINIMUM_DISK_SIZE=17
 
 # total minimum disk size in GB if all usable disks are below this
 # size, the node cannot be installed
-TOTAL_MINIMUM_DISK_SIZE=50
+vs_TOTAL_MINIMUM_DISK_SIZE=50
+lxc_TOTAL_MINIMUM_DISK_SIZE=50
 
 
 # set of langugase for install (used in /etc/rpm/macros)
@@ -93,3 +95,5 @@ NUM_AUTH_FAILURES_BEFORE_DEBUG=2
 
 # location of file containing http/https proxy info, if needed
 PROXY_FILE=/etc/planetlab/http_proxy
+
+ONE_PARTITION=0