Merge branch 'main' into update_torrent_clients

CHANGELOG.md

@@ -5,29 +5,17 @@ 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
-
-- Don't check rc of updateBootCache.py because we may have no cache partition
-
 ## [0.22.1] - 2025-06-27
 
-### Fixed
+### Fixed 
 
 - Included some changes that should be in the previous version
 
 ## [0.22.0] - 2025-06-26
 
-### Changed
+### Changed 
 
-- Changed torrent client from ctorrent to aria2c
+- Changed torrent client from ctorrent to aria2c 
 - Updated ogCreateTorrent function replaced ctorrent with mktorrent
 
 ## [0.21.1] - 2025-06-26

ogclient/lib/python3/BootLib.py

@@ -126,6 +126,14 @@ 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.
@@ -156,6 +164,14 @@ 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)
@@ -685,7 +701,7 @@ def ogGrubInstallMbr (disk, par, checkos='FALSE', kernelparam=''):
         prefixsecondstage = ''        # Reactivamos el grub con el grub.cfg original.
     else:     # SI Reconfigurar segunda etapa (grub.cfg) == TRUE
         #llamada a updateBootCache para que aloje la primera fase del ogLive
-        subprocess.run ([f'{ogGlobals.OGSCRIPTS}/updateBootCache.py'])
+        subprocess.run ([f'{ogGlobals.OGSCRIPTS}/updateBootCache.py'], check=True)
 
         if InventoryLib.ogIsEfiActive():
             # UEFI: grubSintax necesita grub.cfg para detectar los kernels: si no existe recupero backup.