r00t2/bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixing some things...

Browse Source
This commit is contained in:
brent s. 2016-12-14 00:46:16 -05:00
parent b4a5e40b8f
commit f437391818
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bdisk/host.py
View File

@ -79,6 +79,8 @@ def parseConfig(confs):
config_dict['sync']['tftp'] = config['sync'].getboolean('tftp') config_dict['sync']['tftp'] = config['sync'].getboolean('tftp')
config_dict['rsync']['iso'] = config['rsync'].getboolean('iso') config_dict['rsync']['iso'] = config['rsync'].getboolean('iso')
# Get the version... # Get the version...
# Three possibilities.
# e.g. 1 commit after tag with short hash: ['v3.10', '1', 'gb4a5e40']
if config_dict['bdisk']['ver'] == '': if config_dict['bdisk']['ver'] == '':
repo = git.Repo(config_dict['build']['basedir']) repo = git.Repo(config_dict['build']['basedir'])
refs = repo.git.describe(repo.head.commit).split('-') refs = repo.git.describe(repo.head.commit).split('-')

4
bdisk/ipxe.py
View File

@ -27,7 +27,7 @@ def buildIPXE(conf):
ipxe_usb = '{0}-{1}-{2}.usb.img'.format(bdisk['uxname'], bdisk['ver'], build['buildnum']) ipxe_usb = '{0}-{1}-{2}.usb.img'.format(bdisk['uxname'], bdisk['ver'], build['buildnum'])
ipxe_mini = '{0}-{1}-{2}.mini.iso'.format(bdisk['uxname'], bdisk['ver'], build['buildnum']) ipxe_mini = '{0}-{1}-{2}.mini.iso'.format(bdisk['uxname'], bdisk['ver'], build['buildnum'])
ipxe_emini = '{0}-{1}-{2}.mini.eiso'.format(bdisk['uxname'], bdisk['ver'], build['buildnum']) ipxe_emini = '{0}-{1}-{2}.mini.eiso'.format(bdisk['uxname'], bdisk['ver'], build['buildnum'])
usb_file = '{0}/{1}'.format(img_path, ipxe_usb) usb_file = '{0}{1}'.format(img_path, ipxe_usb)
emini_file = '{0}{1}'.format(img_path, ipxe_emini) emini_file = '{0}{1}'.format(img_path, ipxe_emini)
mini_file = '{0}{1}'.format(img_path, ipxe_mini) mini_file = '{0}{1}'.format(img_path, ipxe_mini)
ipxe_git_uri = 'git://git.ipxe.org/ipxe.git' ipxe_git_uri = 'git://git.ipxe.org/ipxe.git'
@ -126,7 +126,7 @@ def buildIPXE(conf):
DEVNULL = open(os.devnull, 'w') DEVNULL = open(os.devnull, 'w')
if os.path.isfile(build['dlpath'] + '/ipxe.log'): if os.path.isfile(build['dlpath'] + '/ipxe.log'):
os.remove(build['dlpath'] + '/ipxe.log') os.remove(build['dlpath'] + '/ipxe.log')
print(('{0}: [IPXE] Building iPXE ({1})... PROGRESS: tail -f {2}/ipxe.log ...').format( print(('{0}: [IPXE] Building iPXE ({1}). PROGRESS: tail -f {2}/ipxe.log ...').format(
datetime.datetime.now(), datetime.datetime.now(),
ipxe_src, ipxe_src,
build['dlpath'])) build['dlpath']))