From d80530c48a78dfeb55293494a257f6234b0ef76d Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Mon, 5 Feb 2024 22:38:04 -0600
Subject: image-tools: T6016: wait for umount in cleanup function
---
python/vyos/system/disk.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
(limited to 'python')
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
--
cgit v1.2.3