From cb0bd3d194ddd4ecaab8e671444f1bf7abc8f908 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Thu, 8 Sep 2022 11:07:55 +0200 Subject: image_create: add legacy ogCopyEfiBootloader Use legacy script that saves the Windows-specific content from the ESP to the image target filesystem. Current image restore solution from OpenGnsys scripts expect the EFI partition to be stored in the target system partition. (Only for Windows 10) For example, storing the ESP in the NTFS partition of a Windows image. Expect use of bash script ogCopyEfiBootloader until further integration is merged. --- src/live/ogOperations.py | 1 + src/utils/legacy.py | 10 ++++++++++ 2 files changed, 11 insertions(+) (limited to 'src') diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py index 439d1d7..ed06540 100644 --- a/src/live/ogOperations.py +++ b/src/live/ogOperations.py @@ -335,6 +335,7 @@ class OgLiveOperations: raise ValueError('Target partition has no filesystem present') cambiar_acceso(user=self._smb_user, pwd=self._smb_pass) + ogCopyEfiBootloader(disk, partition) ogReduceFs(disk, partition) cmd1 = shlex.split(f'partclone.{fstype} -I -C --clone -s {padev} -O -') diff --git a/src/utils/legacy.py b/src/utils/legacy.py index 7ea2bd6..84bd245 100644 --- a/src/utils/legacy.py +++ b/src/utils/legacy.py @@ -53,3 +53,13 @@ def ogChangeRepo(ip): return subprocess.run(f'ogChangeRepo {ipaddr}', shell=True) + + +def ogCopyEfiBootloader(disk, partition): + cmd = f'ogCopyEfiBootloader {disk} {partition]' + try: + proc = subprocess.run(cmd, + shell=True) + except: + logging.error('Exception when running ogCopyEfiBootloader') + raise ValueError('Subprocess error: ogCopyEfiBootloader') -- cgit v1.2.3-18-g5258