summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2024-02-06 10:59:20 -0600
committerGitHub <noreply@github.com>2024-02-06 10:59:20 -0600
commit9d74ae52092e97aa0ef285df4d44a5eb7ae93fbf (patch)
treeb60b52840ed696326736fa401966ce26c86eff0a /python
parent341fe08465cc6c5882164cc5ae0174353a2a492b (diff)
parentd80530c48a78dfeb55293494a257f6234b0ef76d (diff)
downloadvyos-1x-9d74ae52092e97aa0ef285df4d44a5eb7ae93fbf.tar.gz
vyos-1x-9d74ae52092e97aa0ef285df4d44a5eb7ae93fbf.zip
Merge pull request #2941 from jestabro/cleanup-wait
image-tools: T6016: wait for umount in cleanup function
Diffstat (limited to 'python')
-rw-r--r--python/vyos/system/disk.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/python/vyos/system/disk.py b/python/vyos/system/disk.py
index 7860d719f..c8908cd5c 100644
--- a/python/vyos/system/disk.py
+++ b/python/vyos/system/disk.py
@@ -16,6 +16,7 @@
from json import loads as json_loads
from os import sync
from dataclasses import dataclass
+from time import sleep
from psutil import disk_partitions
@@ -207,13 +208,25 @@ def find_device(mountpoint: str) -> str:
Returns:
str: Path to device, Empty if not found
"""
- mounted_partitions = disk_partitions()
+ mounted_partitions = disk_partitions(all=True)
for partition in mounted_partitions:
if partition.mountpoint == mountpoint:
return partition.mountpoint
return ''
+def wait_for_umount(mountpoint: str = '') -> None:
+ """Wait (within reason) for umount to complete
+ """
+ i = 0
+ while find_device(mountpoint):
+ i += 1
+ if i == 5:
+ print(f'Warning: {mountpoint} still mounted')
+ break
+ sleep(1)
+
+
def disks_size() -> dict[str, int]:
"""Get a dictionary with physical disks and their sizes