X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallBootstrapFS.py;h=46c40453d997ad0e3783f79f4ec2fe1e886da159;hb=1e2ad89d3ee07a543bdaa38c2f4d8607e9055f03;hp=ccfad6bffa2766c9f48a8b381d019fec14f687ea;hpb=cc5b5402d2fbe0422d55f4460ee7ca6f12cfb9af;p=bootmanager.git

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index ccfad6b..46c4045 100644
--- a/source/steps/InstallBootstrapFS.py
+++ b/source/steps/InstallBootstrapFS.py
@@ -82,7 +82,7 @@ def Run( vars, 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"],
+    utils.sysexec( "mount -t btrfs %s %s/vservers" % (PARTITIONS["vservers"],
                                                      SYSIMG_PATH), log )
 
     vars['ROOT_MOUNTED']= 1
@@ -110,7 +110,7 @@ def Run( vars, log ):
     if not extensions:
         log.write("Installing only core software\n")
     else:
-        log.write("Requested extensions %r" % extensions)
+        log.write("Requested extensions %r\n" % extensions)
     
     bootstrapfs_names = [ nodefamily ] + extensions
 
@@ -122,13 +122,16 @@ def Run( vars, log ):
         source_hash_file= "/boot/%s.sha1sum" % (tarball)
         dest_hash_file= "%s/%s.sha1sum" % (SYSIMG_PATH, tarball)
 
+        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)
-        log.write( "downloading %s\n" % source_file )
         result = bs_request.DownloadFile( source_file, None, None,
                                          1, 1, dest_file,
                                          30, 14400)
-
+        time_end=time.time()
+        duration=int(time_end-time_beg)
+        log.write("Done downloading (%s seconds)\n"%duration)
         if result:
             # Download SHA1 checksum file
             log.write( "downloading sha1sum for %s\n"%source_file)
@@ -140,9 +143,13 @@ def Run( vars, log ):
             if not utils.check_file_hash(dest_file, dest_hash_file):
                 raise BootManagerException, "FATAL: SHA1 checksum does not match between %s and %s" % (source_file, source_hash_file)
                 
+            
+            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 )
-            log.write( "Done\n")
+            time_end=time.time()
+            duration=int(time_end-time_beg)
+            log.write( "Done extracting (%s seconds)\n"%duration)
             utils.removefile( dest_file )
         else:
             # the main tarball is required
@@ -172,7 +179,7 @@ def Run( vars, log ):
                     SYSIMG_PATH + "/usr/boot/cacert.pem")
         file(SYSIMG_PATH + "/usr/boot/boot_server", "w").write(boot_server)
         shutil.copy("/usr/bootme/pubring.gpg", SYSIMG_PATH + "/usr/boot/pubring.gpg")
-        
+
     # For backward compatibility
     if os.path.exists("/usr/bootme"):
         utils.makedirs(SYSIMG_PATH + "/mnt/cdrom")
@@ -185,7 +192,7 @@ def Run( vars, log ):
                   " >%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
+    # keep a log on the installed hdd
     stamp=file(SYSIMG_PATH + "/bm-install.txt",'w')
     now=time.strftime("%Y-%b-%d @ %H:%M %Z", time.gmtime())
     stamp.write("Hard drive installed by BootManager %s\n"%VERSION)