diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-02-05 22:38:04 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2024-02-05 22:38:04 -0600 |
| commit | d80530c48a78dfeb55293494a257f6234b0ef76d (patch) | |
| tree | 4b783c57c18af395e3ddb142838dee21159a0263 /src/op_mode | |
| parent | c1d0a778f9b2a4587dcf53f5537c1eb8c1581878 (diff) | |
| download | vyos-1x-d80530c48a78dfeb55293494a257f6234b0ef76d.tar.gz vyos-1x-d80530c48a78dfeb55293494a257f6234b0ef76d.zip | |
image-tools: T6016: wait for umount in cleanup function
Diffstat (limited to 'src/op_mode')
| -rwxr-xr-x | src/op_mode/image_installer.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index 501e9b804..d677c2cf8 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -599,6 +599,8 @@ def cleanup(mounts: list[str] = [], remove_items: list[str] = []) -> None: print('Unmounting target filesystems') for mountpoint in mounts: disk.partition_umount(mountpoint) + for mountpoint in mounts: + disk.wait_for_umount(mountpoint) if remove_items: print('Removing temporary files') for remove_item in remove_items: @@ -606,7 +608,8 @@ def cleanup(mounts: list[str] = [], remove_items: list[str] = []) -> None: if Path(remove_item).is_file(): Path(remove_item).unlink() if Path(remove_item).is_dir(): - rmtree(remove_item) + rmtree(remove_item, ignore_errors=True) + def cleanup_raid(details: raid.RaidDetails) -> None: efiparts = [] |