X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallBootstrapFS.py;h=26fd0d3c4816e02167b4ce715f900402856059b0;hb=c5193fd1ea653cb9be2ef25a91bfbe881defe927;hp=a40e2e3b271143eb6fe143db241d300aa2e031cc;hpb=0badb83836184e9883bd25a62c8f918cdf936544;p=bootmanager.git diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index a40e2e3..26fd0d3 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -7,10 +7,11 @@ # All rights reserved. # expected /proc/partitions format -import os, sys, string +import os, 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: @@ -77,23 +80,29 @@ def Run( vars, log ): log.write( "mounting root file system\n" ) utils.sysexec( "mount -t ext3 %s %s" % (PARTITIONS["root"],SYSIMG_PATH), 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"], - SYSIMG_PATH), log ) + fstype = 'ext3' if vars['virt']=='vs' else 'btrfs' + + one_partition = vars['ONE_PARTITION']=='1' + + if (not one_partition): + log.write( "mounting vserver partition in root file system (type %s)\n"%fstype ) + utils.makedirs( SYSIMG_PATH + "/vservers" ) + utils.sysexec( "mount -t %s %s %s/vservers" % \ + (fstype, PARTITIONS["vservers"], SYSIMG_PATH), log ) + + if vars['virt']=='lxc': + # NOTE: btrfs quota is supported from version: >= btrfs-progs-0.20 (f18+) + # older versions will not recongize the 'quota' command. + log.write( "Enabling btrfs quota on %s/vservers\n"%SYSIMG_PATH ) + utils.sysexec_noerr( "btrfs quota enable %s/vservers" % SYSIMG_PATH ) vars['ROOT_MOUNTED']= 1 - # call getNodeFlavour - try: - node_flavour = BootAPI.call_api_function(vars, "GetNodeFlavour", (NODE_ID,) ) - nodefamily = node_flavour['nodefamily'] - extensions = node_flavour['extensions'] - plain = node_flavour['plain'] - except: - raise BootManagerException ("Could not call GetNodeFlavour - need PLCAPI-5.0") - + # this is now retrieved in GetAndUpdateNodeDetails + nodefamily = vars['nodefamily'] + extensions = vars['extensions'] # the 'plain' option is for tests mostly + plain = vars['plain'] if plain: download_suffix=".tar" uncompress_option="" @@ -107,7 +116,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 +128,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 +149,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 @@ -175,11 +191,21 @@ def Run( vars, log ): utils.makedirs(SYSIMG_PATH + "/mnt/cdrom") shutil.copytree("/usr/bootme", SYSIMG_PATH + "/mnt/cdrom/bootme") - # Import the GPG key into the RPM database so that RPMS can be verified - 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), log) - utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab", log) + # ONE_PARTITION => new distribution type + if (vars['ONE_PARTITION']!='1'): + # Import the GPG key into the RPM database so that RPMS can be verified + 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), 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