diff --git a/CHANGELOG.md b/CHANGELOG.md index 5065e09..50cbb5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.9.0] - 2025-06-16 + +### Added + +- Take ogrepository SSH key from its git repo + ## [3.8.0] - 2025-06-16 ### Added diff --git a/boottools/btog.py b/boottools/btog.py index b6ce03e..26a6721 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, ogclientmount, osdistrib, oscodename): +def copy_og_files (builder, og_shared, ogrepo_ssh_key, 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,6 +226,10 @@ 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) + os.makedirs (f'{ogclientmount}/root/.ssh', exist_ok=True) + shutil.copy (f'{ogrepo_ssh_key}/opengnsys', f'{ogclientmount}/root/.ssh/id_ed25519') + shutil.copy (f'{ogrepo_ssh_key}/opengnsys.pub', f'{ogclientmount}/root/.ssh/id_ed25519.pub') + subprocess.run (f'rsync -aH {builder}/includes/* {ogclientmount}/' , shell=True) subprocess.run (f'rsync -aH {og_shared}/* {ogclientmount}/opt/opengnsys/', shell=True) diff --git a/includes/etc/initramfs-tools/scripts/VERSION.txt b/includes/etc/initramfs-tools/scripts/VERSION.txt index c4544b0..45052cc 100644 --- a/includes/etc/initramfs-tools/scripts/VERSION.txt +++ b/includes/etc/initramfs-tools/scripts/VERSION.txt @@ -1 +1 @@ -OpenGnsys Client 3.8.0 +OpenGnsys Client 3.9.0 diff --git a/mkoglive.py b/mkoglive.py index 9a6d84f..71bd988 100755 --- a/mkoglive.py +++ b/mkoglive.py @@ -75,9 +75,10 @@ def _initramfs_version (gitrelease, osrelease, curdir): def _copy_og_files (btrootfsimg, btrootfsmnt, osdistrib, oscodename): _mount_rootfs (btrootfsimg, btrootfsmnt) - builder = '/tmp/opengnsys/oglive_builder' - og_shared = '/tmp/opengnsys/shared' - btog.copy_og_files (builder, og_shared, btrootfsmnt, osdistrib, oscodename) + builder = '/tmp/opengnsys/oglive_builder' + og_shared = '/tmp/opengnsys/shared' + ogrepo_ssh_key = '/tmp/opengnsys/ogrepo-ssh-key' + btog.copy_og_files (builder, og_shared, ogrepo_ssh_key, btrootfsmnt, osdistrib, oscodename) utils.umount (btrootfsmnt) def _chroot_tasks (cfgfile, curdir, osrelease, osarch):