From 74af2f96d84830768d76d57ba835f871f8e1cebe Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 4 Jul 2025 10:12:08 +0200 Subject: [PATCH] refs #2381 do not fail if grub.cfg not found --- CHANGELOG.md | 6 ++++++ ogclient/lib/python3/BootLib.py | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e0baf0..58964b6 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.23.1] - 2025-07-04 + +### Fixed + +- Don't fail if grub.cfg is not found + ## [0.23.0] - 2025-07-03 ### Removed diff --git a/ogclient/lib/python3/BootLib.py b/ogclient/lib/python3/BootLib.py index 9596df1..28c7d6e 100644 --- a/ogclient/lib/python3/BootLib.py +++ b/ogclient/lib/python3/BootLib.py @@ -132,7 +132,10 @@ def ogBoot (disk, par, nvramperm=False, params=''): 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') + if os.path.exists (grub_cfg_src): + shutil.copy2 (grub_cfg_src, f'{esp_mntdir}/boot/grub/grub.cfg') + else: + print ('grub.cfg not found') # Crear orden de arranque (con unos valores por defecto). UEFILib.ogNvramAddEntry (bootlabel, f'/EFI/{bootlabel}/Boot/{bootloader}', nvramperm) @@ -170,7 +173,10 @@ def ogBoot (disk, par, nvramperm=False, params=''): 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') + if os.path.exists (grub_cfg_src): + shutil.copy2 (grub_cfg_src, f'{esp_mntdir}/boot/grub/grub.cfg') + else: + print ('grub.cfg not found') # Crear orden de arranque (con unos valores por defecto). l = re.sub ('^.*EFI(.*)$', r'\1', loader)