From a142bb2729b50d501c60461e09b9a54698e45de8 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 27 Jun 2025 13:27:52 +0200 Subject: [PATCH] refs #2348 don't copy grub.cfg --- CHANGELOG.md | 6 ++++++ ogclient/lib/python3/BootLib.py | 16 ---------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73e6a01..0d88470 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). +## [0.22.3] - 2025-06-27 + +### Changed + +- Don't copy grub.cfg + ## [0.22.2] - 2025-06-27 ### Fixed diff --git a/ogclient/lib/python3/BootLib.py b/ogclient/lib/python3/BootLib.py index cbc21e7..5660585 100644 --- a/ogclient/lib/python3/BootLib.py +++ b/ogclient/lib/python3/BootLib.py @@ -126,14 +126,6 @@ def ogBoot (disk, par, nvramperm=False, params=''): SystemLib.ogRaiseError ([], ogGlobals.OG_ERR_NOTFOUND, f'{esp} Boot loader') return None - esp_dev = DiskLib.ogDiskToDev (efidisk, efipart) - esp_mntdir = esp_dev.replace ('dev', 'mnt') - os.makedirs (f'{esp_mntdir}/boot/grub', exist_ok=True) - grub_cfg_src = f'{esp_mntdir}/EFI/{bootlabel}/Boot/grub.cfg' - if not os.path.exists (grub_cfg_src): - grub_cfg_src = f'{esp_mntdir}/boot/grubMBR/boot/grub/grub.cfg' - shutil.copy2 (grub_cfg_src, f'{esp_mntdir}/boot/grub/grub.cfg') - # Crear orden de arranque (con unos valores por defecto). UEFILib.ogNvramAddEntry (bootlabel, f'/EFI/{bootlabel}/Boot/{bootloader}', nvramperm) # Marcar próximo arranque y reiniciar. @@ -164,14 +156,6 @@ def ogBoot (disk, par, nvramperm=False, params=''): SystemLib.ogRaiseError ([], ogGlobals.OG_ERR_NOTOS, f'{disk} {par} ({type}, EFI)') return None - esp_dev = DiskLib.ogDiskToDev (efidisk, efipart) - esp_mntdir = esp_dev.replace ('dev', 'mnt') - os.makedirs (f'{esp_mntdir}/boot/grub', exist_ok=True) - grub_cfg_src = f'{esp_mntdir}/EFI/{bootlabel}/Boot/grub.cfg' - if not os.path.exists (grub_cfg_src): - grub_cfg_src = f'{esp_mntdir}/boot/grubMBR/boot/grub/grub.cfg' - shutil.copy2 (grub_cfg_src, f'{esp_mntdir}/boot/grub/grub.cfg') - # Crear orden de arranque (con unos valores por defecto). l = re.sub ('^.*EFI(.*)$', r'\1', loader) UEFILib.ogNvramAddEntry (bootlabel, '/EFI'+l, nvramperm)