diff --git a/boottools/btog.py b/boottools/btog.py index 524cbfe..b6ce03e 100644 --- a/boottools/btog.py +++ b/boottools/btog.py @@ -205,7 +205,7 @@ def debootstrap (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp): logger.info (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}" : ok') return 0 -def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, oscodename): +def copy_og_files (builder, og_shared, ogclientmount, osdistrib, oscodename): logger.info ('Iniciando la personalización con datos del repositorio') sources_list_in = f'{builder}/includes/etc/apt/sources.list.{osdistrib.lower()}' @@ -226,9 +226,8 @@ def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, osco os.makedirs (f'{ogclientmount}/usr/local/lib', exist_ok=True) os.makedirs (f'{ogclientmount}/usr/local/plugins', exist_ok=True) - subprocess.run (f'rsync -aH {builder}/includes/* {ogclientmount}/' , shell=True) - subprocess.run (f'rsync -aH {og_shared}/* {ogclientmount}/opt/opengnsys/' , shell=True) - subprocess.run (f'rsync -aH {og_engine}/* {ogclientmount}/opt/opengnsys/lib/engine/bin/', shell=True) + subprocess.run (f'rsync -aH {builder}/includes/* {ogclientmount}/' , shell=True) + subprocess.run (f'rsync -aH {og_shared}/* {ogclientmount}/opt/opengnsys/', shell=True) if not os.path.exists (f'{ogclientmount}/etc/pci.ids'): shutil.copy (f'{og_shared}/lib/pci.ids', f'{ogclientmount}/etc/') @@ -240,7 +239,7 @@ def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, osco subprocess.run (f'rsync -aH {og_shared}/lib/qtplugins/* {ogclientmount}/usr/local/plugins', shell=True) # Browser - if os.path.exists (f'{og_shared}/bin/browser'): shutil.copy (f'{og_shared}/bin/browser', f'{ogclientmount}/bin/') + if os.path.exists (f'{og_shared}/bin/browser'): shutil.copy (f'{og_shared}/bin/browser', f'{ogclientmount}/bin/') def sysctl (btrootfsmnt): logger.debug ('copiando sysctl.conf') diff --git a/mkoglive.py b/mkoglive.py index 72d04db..1b25448 100755 --- a/mkoglive.py +++ b/mkoglive.py @@ -77,8 +77,7 @@ def _copy_og_files (btrootfsimg, btrootfsmnt, osdistrib, oscodename): _mount_rootfs (btrootfsimg, btrootfsmnt) builder = '/tmp/opengnsys/oglive_builder' og_shared = '/tmp/opengnsys/shared' - og_engine = '/tmp/opengnsys/engine' - btog.copy_og_files (builder, og_shared, og_engine, btrootfsmnt, osdistrib, oscodename) + btog.copy_og_files (builder, og_shared, btrootfsmnt, osdistrib, oscodename) utils.umount (btrootfsmnt) def _chroot_tasks (cfgfile, curdir, osrelease, osarch):