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

refs #596 refactor (u)mounts

pybuilder
Natalia Serrano 2024-08-14 10:59:56 +02:00
parent c5e9f6858d
commit c67b7f6e91
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
boottoolsfunctions/__init__.py
View File

@ -35,6 +35,10 @@ def _grep (regex, file):
def _is_mounted (mntpt): def _is_mounted (mntpt):
return _grep (mntpt, '/proc/mounts') return _grep (mntpt, '/proc/mounts')
def _mount (dev, mntpt, opts=[]):
if not _is_mounted (mntpt):
_run (['mount', dev, mntpt] + opts)
def _umount (mntpt): def _umount (mntpt):
if (_is_mounted (mntpt)): if (_is_mounted (mntpt)):
_run (['umount', mntpt]) _run (['umount', mntpt])
@ -302,17 +306,10 @@ def btogSetFsAccess (btrootfsimg):
def btogSetFsBase (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp): def btogSetFsBase (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp):
logger.info ('Iniciando la generación del sistema de archivos') logger.info ('Iniciando la generación del sistema de archivos')
#mount | grep $BTROOTFSMNT || mount $BTROOTFSIMG $BTROOTFSMNT -o loop,offset=32256
if (not _is_mounted (btrootfsmnt)):
raise Exception ('rootfs should be mounted')
logger.info ('debootstrapping system') logger.info ('debootstrapping system')
logger.debug (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}"') logger.debug (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}"')
try: _run (['debootstrap', f'--arch={osarch}', '--components=main,universe', oscodename, btrootfsmnt, oshttp]) try: _run (['debootstrap', f'--arch={osarch}', '--components=main,universe', oscodename, btrootfsmnt, oshttp])
except: except: raise Exception (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}" : ha fallado!')
if (_is_mounted (btrootfsmnt)):
_run (['umount', btrootfsmnt])
raise Exception (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}" : ha fallado!')
logger.info (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}" : ok') logger.info (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}" : ok')
return 0 return 0
@ -441,7 +438,7 @@ def btogIsoGenerator (pxepkg, isolinux_tpl, bttargetdir, nameisoclient):
os.mkdir ('/tmp/iso/isolinux/mount') os.mkdir ('/tmp/iso/isolinux/mount')
_run (['mount', '-o', 'loop', f'/tmp/iso/isolinux/{pxepkg}.iso', '/tmp/iso/isolinux/mount']) _run (['mount', '-o', 'loop', f'/tmp/iso/isolinux/{pxepkg}.iso', '/tmp/iso/isolinux/mount'])
subprocess.run (['cp -a /tmp/iso/isolinux/mount/* /tmp/iso/isolinux'], shell=True) subprocess.run (['cp -a /tmp/iso/isolinux/mount/* /tmp/iso/isolinux'], shell=True)
_run (['umount', '/tmp/iso/isolinux/mount']) _umount ('/tmp/iso/isolinux/mount')
os.rmdir ('/tmp/iso/isolinux/mount') os.rmdir ('/tmp/iso/isolinux/mount')
os.unlink (f'/tmp/iso/isolinux/{pxepkg}.iso') os.unlink (f'/tmp/iso/isolinux/{pxepkg}.iso')