summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOpenGnSys Support Team <soporte-og@soleta.eu>2024-08-12 10:46:40 +0200
committerOpenGnSys Support Team <soporte-og@soleta.eu>2024-08-21 09:21:53 +0200
commit1ca3992f719f3a1f581c9253f061d76338137e7a (patch)
treec1f161c22a4345cf0aa4a7c61643f9874bc6c8f1 /src
parent9fa4a5f6510c43484b879823c7e5fb6e6cff2a89 (diff)
src: remove call to restoreImageCustom script
remove call to custom version of legacy script, display warning.
Diffstat (limited to 'src')
-rw-r--r--src/live/ogOperations.py5
-rw-r--r--src/utils/image.py19
2 files changed, 3 insertions, 21 deletions
diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py
index 98528a7..2ae44aa 100644
--- a/src/live/ogOperations.py
+++ b/src/live/ogOperations.py
@@ -500,8 +500,9 @@ class OgLiveOperations:
logging.info(f'Request to restore image {name}.img via {ctype} from {repo}')
if shutil.which('restoreImageCustom'):
- restoreImageCustom(repo, name, disk, partition, ctype)
- elif 'UNICAST' in ctype:
+ logging.warning(f'Ignoring restoreImageCustom, use postconfiguration scripts instead.')
+
+ if 'UNICAST' in ctype:
cache = 'DIRECT' not in ctype
self._restore_image_unicast(repo, name, partdev, cache)
elif ctype == 'TIPTORRENT':
diff --git a/src/utils/image.py b/src/utils/image.py
index a12c221..b0ce057 100644
--- a/src/utils/image.py
+++ b/src/utils/image.py
@@ -215,22 +215,3 @@ def ogChangeRepo(ip, smb_user='opengnsys', smb_pass='og'):
subprocess.run(shlex.split(cmd))
return err
-
-
-def restoreImageCustom(repo_ip, image_name, disk, partition, method):
- """
- """
- if not shutil.which('restoreImageCustom'):
- raise OgError('restoreImageCustom not found')
-
- cmd = f'restoreImageCustom {repo_ip} {image_name} {disk} {partition} {method}'
- with open('/tmp/command.log', 'wb', 0) as logfile:
- try:
- proc = subprocess.run(cmd,
- stdout=logfile,
- encoding='utf-8',
- shell=True,
- check=True)
- except OSError as e:
- raise OgError(f'Error processing restoreImageCustom: {e}') from e
- return proc.returncode