just print out node's 'virt' as gotten from GetNodeFlavour

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

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index a40e2e3..d22ed2a 100644 (file)
--- a/source/steps/InstallBootstrapFS.py
+++ b/source/steps/InstallBootstrapFS.py
@@ -11,6 +11,7 @@ import os, sys, string
 import popen2
 import shutil
 import traceback 
+import time
 
 from Exceptions import *
 import utils
@@ -51,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:
@@ -93,6 +96,7 @@ def Run( vars, log ):
     except:
         raise BootManagerException ("Could not call GetNodeFlavour - need PLCAPI-5.0")
     
+    log.write ("Retrieved 'virt' style %s from GetNodeFlavour\n"%node_flavour['virt'])
     # the 'plain' option is for tests mostly
     if plain:
         download_suffix=".tar"
@@ -107,7 +111,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,13 +123,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)
@@ -137,9 +144,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
@@ -182,4 +193,12 @@ 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
+    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