summaryrefslogtreecommitdiff
path: root/python/vyos
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-12-06 10:56:17 -0600
committerJohn Estabrook <jestabro@vyos.io>2023-12-07 07:11:15 -0600
commit32551842bb0f710f590e8c030395a3a7902aa1df (patch)
treeda7459e02849bf3353a7b247042e9337e3d95ca1 /python/vyos
parent18ee2422cf8a24a6a63d07e565fb677d05f881db (diff)
downloadvyos-1x-32551842bb0f710f590e8c030395a3a7902aa1df.tar.gz
vyos-1x-32551842bb0f710f590e8c030395a3a7902aa1df.zip
image-tools: T5758: restore saving previous data on install
Restore scanning previous installations for config data and ssh host keys on install.
Diffstat (limited to 'python/vyos')
-rw-r--r--python/vyos/system/disk.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/python/vyos/system/disk.py b/python/vyos/system/disk.py
index 49e6b5c5e..f8e0fd1bf 100644
--- a/python/vyos/system/disk.py
+++ b/python/vyos/system/disk.py
@@ -150,7 +150,7 @@ def filesystem_create(partition: str, fstype: str) -> None:
def partition_mount(partition: str,
path: str,
fsype: str = '',
- overlay_params: dict[str, str] = {}) -> None:
+ overlay_params: dict[str, str] = {}) -> bool:
"""Mount a partition into a path
Args:
@@ -159,6 +159,9 @@ def partition_mount(partition: str,
fsype (str): optionally, set fstype ('squashfs', 'overlay', 'iso9660')
overlay_params (dict): optionally, set overlay parameters.
Defaults to None.
+
+ Returns:
+ bool: True on success
"""
if fsype in ['squashfs', 'iso9660']:
command: str = f'mount -o loop,ro -t {fsype} {partition} {path}'
@@ -171,7 +174,11 @@ def partition_mount(partition: str,
else:
command = f'mount {partition} {path}'
- run(command)
+ rc = run(command)
+ if rc == 0:
+ return True
+
+ return False
def partition_umount(partition: str = '', path: str = '') -> None: