merge master into lxc_devel

[bootmanager.git] / source / steps / InstallBootstrapFS.py

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index 71ac9ab..46c4045 100644 (file)
--- a/source/steps/InstallBootstrapFS.py
+++ b/source/steps/InstallBootstrapFS.py
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 #
-# $Id$
-# $URL$
-#
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
 #
@@ -14,6 +11,7 @@ import os, sys, string
 import popen2
 import shutil
 import traceback 
+import time
 
 from Exceptions import *
 import utils
@@ -54,6 +52,8 @@ def Run( vars, log ):
         if NODE_ID == "":
             raise ValueError, "NODE_ID"
 
+        VERSION=vars['VERSION'] or 'unknown'
+
     except KeyError, var:
         raise BootManagerException, "Missing variable in vars: %s\n" % var
     except ValueError, var:
@@ -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
 
@@ -119,16 +119,37 @@ def Run( vars, log ):
         source_file= "/boot/%s" % (tarball)
         dest_file= "%s/%s" % (SYSIMG_PATH, tarball)
 
+        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,
+        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)
+            result = bs_request.DownloadFile( source_hash_file, None, None,
+                                         1, 1, dest_hash_file,
+                                         30, 14400)
+ 
+            log.write( "verifying sha1sum for %s\n"%source_file)
+            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")
+            result = utils.sysexec( "tar -C %s -xpf %s %s" % (SYSIMG_PATH,dest_file,uncompress_option), log )
+            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
@@ -158,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")
@@ -168,7 +189,15 @@ def Run( vars, log ):
     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))
-    utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab")
+                  " >%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')
+    now=time.strftime("%Y-%b-%d @ %H:%M %Z", time.gmtime())
+    stamp.write("Hard drive installed by BootManager %s\n"%VERSION)
+    stamp.write("Finished extraction of bootstrapfs on %s\n"%now)
+    stamp.write("Using nodefamily %s\n"%nodefamily)
+    stamp.close()
 
     return 1