A couple of minor bugs fixed.

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

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index a40e2e3..bc46450 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:
@@ -107,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
 
@@ -169,7 +172,11 @@ 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")
-        
+    
+    # Creating /cgroup directory
+    if not os.path.exists(SYSIMG_PATH + "/cgroup"):
+        utils.makedirs(SYSIMG_PATH + "/cgroup")
+
     # For backward compatibility
     if os.path.exists("/usr/bootme"):
         utils.makedirs(SYSIMG_PATH + "/mnt/cdrom")
@@ -182,4 +189,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