X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallBootstrapFS.py;h=26fd0d3c4816e02167b4ce715f900402856059b0;hb=c5193fd1ea653cb9be2ef25a91bfbe881defe927;hp=a69d61fc61aeaf2a4b77994a69ea94223911ae57;hpb=bea310caa8f3a8aacf70f7555338152d0e4e75bb;p=bootmanager.git

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index a69d61f..26fd0d3 100644
--- a/source/steps/InstallBootstrapFS.py
+++ b/source/steps/InstallBootstrapFS.py
@@ -7,7 +7,7 @@
 # All rights reserved.
 # expected /proc/partitions format
 
-import os, sys, string
+import os, string
 import popen2
 import shutil
 import traceback 
@@ -80,23 +80,29 @@ def Run( vars, log ):
     log.write( "mounting root file system\n" )
     utils.sysexec( "mount -t ext3 %s %s" % (PARTITIONS["root"],SYSIMG_PATH), log )
 
-    log.write( "mounting vserver partition in root file system\n" )
-    utils.makedirs( SYSIMG_PATH + "/vservers" )
-    utils.sysexec( "mount -t ext3 %s %s/vservers" % (PARTITIONS["vservers"],
-                                                     SYSIMG_PATH), log )
+    fstype = 'ext3' if vars['virt']=='vs' else 'btrfs'
+
+    one_partition = vars['ONE_PARTITION']=='1'
+
+    if (not one_partition):
+        log.write( "mounting vserver partition in root file system (type %s)\n"%fstype )
+        utils.makedirs( SYSIMG_PATH + "/vservers" )
+        utils.sysexec( "mount -t %s %s %s/vservers" % \
+                           (fstype, PARTITIONS["vservers"], SYSIMG_PATH), log )
+
+        if vars['virt']=='lxc':
+            # NOTE: btrfs quota is supported from version: >= btrfs-progs-0.20 (f18+)
+            #       older versions will not recongize the 'quota' command.
+            log.write( "Enabling btrfs quota on %s/vservers\n"%SYSIMG_PATH )
+            utils.sysexec_noerr( "btrfs quota enable %s/vservers" % SYSIMG_PATH )
 
     vars['ROOT_MOUNTED']= 1
 
-    # call getNodeFlavour
-    try:
-        node_flavour = BootAPI.call_api_function(vars, "GetNodeFlavour", (NODE_ID,) )
-        nodefamily = node_flavour['nodefamily']
-        extensions = node_flavour['extensions']
-        plain = node_flavour['plain']
-    except:
-        raise BootManagerException ("Could not call GetNodeFlavour - need PLCAPI-5.0")
-    
+    # this is now retrieved in GetAndUpdateNodeDetails
+    nodefamily = vars['nodefamily']
+    extensions = vars['extensions']
     # the 'plain' option is for tests mostly
+    plain = vars['plain']
     if plain:
         download_suffix=".tar"
         uncompress_option=""
@@ -122,14 +128,14 @@ def Run( vars, log ):
         source_hash_file= "/boot/%s.sha1sum" % (tarball)
         dest_hash_file= "%s/%s.sha1sum" % (SYSIMG_PATH, tarball)
 
-        time_beg=time.now()
+        time_beg=time.time()
         log.write( "downloading %s\n" % source_file )
         # 30 is the connect timeout, 14400 is the max transfer time in
         # seconds (4 hours)
         result = bs_request.DownloadFile( source_file, None, None,
                                          1, 1, dest_file,
                                          30, 14400)
-        time_end=time.now()
+        time_end=time.time()
         duration=int(time_end-time_beg)
         log.write("Done downloading (%s seconds)\n"%duration)
         if result:
@@ -144,10 +150,10 @@ def Run( vars, log ):
                 raise BootManagerException, "FATAL: SHA1 checksum does not match between %s and %s" % (source_file, source_hash_file)
                 
             
-            time_beg=time.now()
+            time_beg=time.time()
             log.write( "extracting %s in %s\n" % (dest_file,SYSIMG_PATH) )
             result = utils.sysexec( "tar -C %s -xpf %s %s" % (SYSIMG_PATH,dest_file,uncompress_option), log )
-            time_end=time.now()
+            time_end=time.time()
             duration=int(time_end-time_beg)
             log.write( "Done extracting (%s seconds)\n"%duration)
             utils.removefile( dest_file )
@@ -185,12 +191,14 @@ def Run( vars, log ):
         utils.makedirs(SYSIMG_PATH + "/mnt/cdrom")
         shutil.copytree("/usr/bootme", SYSIMG_PATH + "/mnt/cdrom/bootme")
 
-    # Import the GPG key into the RPM database so that RPMS can be verified
-    utils.makedirs(SYSIMG_PATH + "/etc/pki/rpm-gpg")
-    utils.sysexec("gpg --homedir=/root --export --armor" \
-                  " --no-default-keyring --keyring %s/usr/boot/pubring.gpg" \
-                  " >%s/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab" % (SYSIMG_PATH, SYSIMG_PATH), log)
-    utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab", log)
+    # ONE_PARTITION => new distribution type
+    if (vars['ONE_PARTITION']!='1'):
+        # Import the GPG key into the RPM database so that RPMS can be verified
+        utils.makedirs(SYSIMG_PATH + "/etc/pki/rpm-gpg")
+        utils.sysexec("gpg --homedir=/root --export --armor" \
+                      " --no-default-keyring --keyring %s/usr/boot/pubring.gpg" \
+                      " >%s/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab" % (SYSIMG_PATH, SYSIMG_PATH), log)
+        utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab", log)
 
     # keep a log on the installed hdd
     stamp=file(SYSIMG_PATH + "/bm-install.txt",'w')