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
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
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)
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
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")
" >%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)