From 5dfeffb6d676b372232c8742497ed23fcb749e3e Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 27 Feb 2025 12:12:37 +0100 Subject: [PATCH 1/2] refs #1614 remove useless copy--engine files are already under shared/ --- boottools/btog.py | 3 +-- mkoglive.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/boottools/btog.py b/boottools/btog.py index 524cbfe..4679343 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()}' @@ -228,7 +228,6 @@ def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, osco 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) if not os.path.exists (f'{ogclientmount}/etc/pci.ids'): shutil.copy (f'{og_shared}/lib/pci.ids', f'{ogclientmount}/etc/') 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): -- 2.40.1 From 1ee274bd0b2cc9aaef9c7e14f3ec15f063b21e43 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 27 Feb 2025 12:12:57 +0100 Subject: [PATCH 2/2] refs #1614 fix whitespace --- boottools/btog.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boottools/btog.py b/boottools/btog.py index 4679343..b6ce03e 100644 --- a/boottools/btog.py +++ b/boottools/btog.py @@ -226,8 +226,8 @@ def copy_og_files (builder, og_shared, ogclientmount, osdistrib, oscodename): 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 {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/') @@ -239,7 +239,7 @@ def copy_og_files (builder, og_shared, ogclientmount, osdistrib, oscodename): 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') -- 2.40.1