opengnsys
/
oglive-builder
2
1
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

refs #596 correctly handle invalid param, make mkisofs quieter

pull/1/head
Natalia Serrano 2024-08-20 10:13:14 +02:00
parent ef4ff2a739
commit bb2d57b637
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
boottools/btog.py
View File

@ -151,8 +151,12 @@ def GetOsInfo1 (type_client):
osarch, _=utils.run (['dpkg', '--print-architecture'])
oshttp='http://es.archive.ubuntu.com/ubuntu/'
else: # Parámetro desconocido
print ('Parámetro no válido.')
os.exit (1)
logger.error ('Parámetro no válido.')
osdistrib=None
oscodename=None
osrelease=None
osarch=None
oshttp=None
return osdistrib, oscodename, osrelease, osarch, oshttp
def GetOsInfo2 (ogrepo_dir, versionboottools, oscodename, osrelease, osarch):
@ -199,8 +203,6 @@ def mkrootfs (btrootfsimg, btrootfsimglabel, btrootfsmnt, btvirtualdisksize, btt
logger.info ('Partitioning disk image')
stdout, _ = utils.run (['bash', '-c', f"echo $'n\np\n1\n\n\nt\n83\nw' |fdisk {diskloop}"])
logger.debug (f'fdisk stdout follows:')
for i in stdout.strip().split('\n'): logger.debug (' ' + i)
time.sleep (3)
logger.debug ('losetup --detach')
@ -430,8 +432,8 @@ def mkisofs (pxepkg, isolinux_tpl, bttargetdir, nameisoclient):
oldpwd = os.getcwd()
os.chdir ('/tmp')
logger.debug (f'mkisofs -V ogClient -o {nameisoclient}.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -J -no-emul-boot -boot-load-size 4 -boot-info-table /tmp/iso')
utils.run (['mkisofs', '-V', 'ogClient', '-o', f'{nameisoclient}.iso', '-b', 'isolinux/isolinux.bin', '-c', 'isolinux/boot.cat', '-J', '-no-emul-boot', '-boot-load-size', '4', '-boot-info-table', '/tmp/iso'])
logger.debug (f'mkisofs -quiet -V ogClient -o {nameisoclient}.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -J -no-emul-boot -boot-load-size 4 -boot-info-table /tmp/iso')
utils.run (['mkisofs', '-quiet', '-V', 'ogClient', '-o', f'{nameisoclient}.iso', '-b', 'isolinux/isolinux.bin', '-c', 'isolinux/boot.cat', '-J', '-no-emul-boot', '-boot-load-size', '4', '-boot-info-table', '/tmp/iso'])
utils.write_md5 (f'{nameisoclient}.iso')
os.chdir (oldpwd)

3
mkoglive.py
View File

@ -155,6 +155,9 @@ ogrepo_dir = '/tmp/ogrepo'
clone_client_dirs (ogrepo_url, ogrepo_branch, ogrepo_dir)
osdistrib, oscodename, osrelease, osarch, oshttp = btog.GetOsInfo1 (type_client)
if osdistrib is None:
logger.error ('GetOsInfo1() failed')
sys.exit (1)
btdir, bttargetdir, btrootfsimg, btrootfsmnt, btrootfsimglabel, log_file, versionboottools, btvirtualdisksize = btog.GetVar (osarch)
gitrelease, nameisoclient, namehostclient = btog.GetOsInfo2 (ogrepo_dir, versionboottools, oscodename, osrelease, osarch)
logger.info (':'.join ([osdistrib, oscodename, osrelease, osarch, oshttp]))