X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallBootstrapFS.py;h=39c8eccfd5d1a3f900eaf8fe03c9d67e83ef6c27;hb=fe23760f25714e4e5b1d62a1765bd69a621677bc;hp=0bd8c2e4b1f2873b8994c5ff346a4eadbc48154c;hpb=b0875f43fc290231ae1da33943bd4982104b9ff3;p=bootmanager.git

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index 0bd8c2e..39c8ecc 100644
--- 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:
@@ -131,10 +131,12 @@ def Run( vars, log ):
 
         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)
                 
@@ -180,7 +182,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