From 87e738b33ffea0bb730cbe041189276a9627cdf7 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Wed, 14 Sep 2022 10:52:45 +0200 Subject: image_restore: fix ogCopyEfiBootLoader ogCopyEfiBootloader is an invalid legacy bash function name. Rename to the correct function name 'ogCopyEfiBootLoader' and rename utility python wrapper too. Fixes: 0bd037c1a409c65fbcb01355ee0dd6dca770330e --- src/live/ogOperations.py | 2 +- src/utils/legacy.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py index cf93ed4..d6e2b6c 100644 --- a/src/live/ogOperations.py +++ b/src/live/ogOperations.py @@ -335,7 +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) + 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 84bd245..8f39fe2 100644 --- a/src/utils/legacy.py +++ b/src/utils/legacy.py @@ -1,4 +1,5 @@ import ipaddress +import logging import os import subprocess import shlex @@ -55,11 +56,11 @@ def ogChangeRepo(ip): shell=True) -def ogCopyEfiBootloader(disk, partition): - cmd = f'ogCopyEfiBootloader {disk} {partition]' +def ogCopyEfiBootLoader(disk, partition): + cmd = f'ogCopyEfiBootLoader {disk} {partition}' try: proc = subprocess.run(cmd, shell=True) except: - logging.error('Exception when running ogCopyEfiBootloader') + logging.error('Exception when running ogCopyEfiBootLoader subprocess') raise ValueError('Subprocess error: ogCopyEfiBootloader') -- cgit v1.2.3-18-g5258