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

refs #953 do this change in a higher-level place, and use an underscore

browser
Natalia Serrano 2024-10-23 17:51:22 +02:00 committed by Vadim Troshchinskiy
parent 8c0c17737c
commit 20d305056a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boottools/btog.py
View File

@ -365,17 +365,16 @@ def mkisofs (pxepkg, isolinux_tpl, bttargetdir, nameisoclient):
#el ogclienteToISO debe tener una copia del ogvmlinuz como linuxISO #el ogclienteToISO debe tener una copia del ogvmlinuz como linuxISO
#cp -prv /var/lib/tftpboot/ogclientToIso/* /tmp/iso/ogclient #cp -prv /var/lib/tftpboot/ogclientToIso/* /tmp/iso/ogclient
today = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d')
oldpwd = os.getcwd() oldpwd = os.getcwd()
os.chdir ('/tmp') os.chdir ('/tmp')
logger.debug (f'mkisofs -quiet -V ogClient -o {nameisoclient}-{today}.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}-{today}.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}-{today}.iso') utils.write_md5 (f'{nameisoclient}.iso')
os.chdir (oldpwd) os.chdir (oldpwd)
shutil.move (f'/tmp/{nameisoclient}-{today}.iso' , f'/var/lib/tftpboot/ogclient/{nameisoclient}-{today}.iso') shutil.move (f'/tmp/{nameisoclient}.iso' , f'/var/lib/tftpboot/ogclient/{nameisoclient}.iso')
shutil.move (f'/tmp/{nameisoclient}-{today}.iso.sum', f'/var/lib/tftpboot/ogclient/{nameisoclient}-{today}.iso.sum') shutil.move (f'/tmp/{nameisoclient}.iso.sum', f'/var/lib/tftpboot/ogclient/{nameisoclient}.iso.sum')
#def __unused_boottoolsBootGraphics(): #def __unused_boottoolsBootGraphics():
# find /tmp/opengnsys_installer/ -name .svn -type d -exec rm -fr {} \; 2>/dev/null; # find /tmp/opengnsys_installer/ -name .svn -type d -exec rm -fr {} \; 2>/dev/null;

4
mkoglive.py
View File

@ -8,6 +8,7 @@ import glob
import stat import stat
import shutil import shutil
import argparse import argparse
import datetime
curdir = os.path.dirname (__file__) curdir = os.path.dirname (__file__)
sys.path.insert (0, curdir) sys.path.insert (0, curdir)
@ -144,7 +145,8 @@ def _main (cfgfile, config, type_client):
logger.info ('STAGE 4 - generate distribution files') logger.info ('STAGE 4 - generate distribution files')
pxepkg = _get_pxepkg() pxepkg = _get_pxepkg()
nameisoclient = '-'.join (['ogLive', oscodename, osrelease, osarch, gitrelease]) today = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d')
nameisoclient = '-'.join (['ogLive', oscodename, osrelease, osarch, gitrelease+'_'+today])
_mkinitrd_squashfs_isofs (bttargetdir, osrelease, btrootfsimg, btrootfsmnt, pxepkg, isolinux_tpl, nameisoclient) _mkinitrd_squashfs_isofs (bttargetdir, osrelease, btrootfsimg, btrootfsmnt, pxepkg, isolinux_tpl, nameisoclient)
logger.info ('OpenGnsys installation finished') logger.info ('OpenGnsys installation finished')