opengnsys
/
ogclone-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'refs #2236 look for grub.cfg in two places' (#62) from fix-ogboot into main
ogclient/pipeline/head There was a failure building this commit Details
ogclient/pipeline/tag This commit looks good Details 

Reviewed-on: #62
pull/63/head 0.18.1
Natalia Serrano 2025-06-18 09:49:40 +02:00
parent 6c543660f9 c7081b3921
commit d5fe20d291
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -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.18.1] - 2025-06-18
### Fixed
- Look for grub.cfg in two places rather than one
## [0.18.0] - 2025-06-16
### Added

10
ogclient/lib/python3/BootLib.py
View File

@ -129,7 +129,10 @@ def ogBoot (disk, par, nvramperm=False, params=''):
esp_dev = DiskLib.ogDiskToDev (efidisk, efipart)
esp_mntdir = esp_dev.replace ('dev', 'mnt')
os.makedirs (f'{esp_mntdir}/boot/grub', exist_ok=True)
shutil.copy2 (f'{esp_mntdir}/EFI/{bootlabel}/Boot/grub.cfg', f'{esp_mntdir}/boot/grub/grub.cfg')
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)
@ -164,7 +167,10 @@ def ogBoot (disk, par, nvramperm=False, params=''):
esp_dev = DiskLib.ogDiskToDev (efidisk, efipart)
esp_mntdir = esp_dev.replace ('dev', 'mnt')
os.makedirs (f'{esp_mntdir}/boot/grub', exist_ok=True)
shutil.copy2 (f'{esp_mntdir}/EFI/{bootlabel}/Boot/grub.cfg', f'{esp_mntdir}/boot/grub/grub.cfg')
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)