sysadmin/openfreemap
1
0
Fork 0
mirror of https://github.com/hyperknot/openfreemap.git synced 2026-05-21 14:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

work

Browse Source
This commit is contained in:
Zsolt Ero
2025-10-09 23:48:17 +02:00
parent 3ace404697
commit 8167f6baf9
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/http_host/http_host_lib/mount.py
View File

@@ -67,13 +67,22 @@ def clean_up_mounts(mnt_dir):
p = subprocess.run(['mount'], capture_output=True, text=True, check=True) p = subprocess.run(['mount'], capture_output=True, text=True, check=True)
lines = [l for l in p.stdout.splitlines() if f'{mnt_dir}/' in l and '(deleted)' in l] lines = [l for l in p.stdout.splitlines() if f'{mnt_dir}/' in l and '(deleted)' in l]
# Extract unique mount paths (deduplicate)
mount_paths = set()
for l in lines: for l in lines:
mnt_path = Path(l.split('(deleted) on ')[1].split(' type btrfs')[0]) mnt_path = Path(l.split('(deleted) on ')[1].split(' type btrfs')[0])
mount_paths.add(mnt_path)
# Process each unique mount path once
for mnt_path in mount_paths:
if not mnt_path.exists():
print(f' skipping {mnt_path} (already removed)')
continue
print(f' removing deleted mount {mnt_path}') print(f' removing deleted mount {mnt_path}')
assert mnt_path.exists()
# Unmount ALL instances (handle stacked mounts) # Unmount ALL instances (handle stacked mounts)
while subprocess.run(['mountpoint', '-q', mnt_path]).returncode == 0: while subprocess.run(['mountpoint', '-q', str(mnt_path)]).returncode == 0:
print(f' unmounting {mnt_path}') print(f' unmounting {mnt_path}')
subprocess.run(['umount', mnt_path], check=True) subprocess.run(['umount', mnt_path], check=True)
@@ -90,7 +99,7 @@ def clean_up_mounts(mnt_dir):
print(f' removing old mount {subdir}') print(f' removing old mount {subdir}')
# Unmount ALL instances here too # Unmount ALL instances here too
while subprocess.run(['mountpoint', '-q', subdir]).returncode == 0: while subprocess.run(['mountpoint', '-q', str(subdir)]).returncode == 0:
print(f' unmounting {subdir}') print(f' unmounting {subdir}')
subprocess.run(['umount', subdir], check=True) subprocess.run(['umount', subdir], check=True)