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
2024-01-02 19:43:42 +01:00
parent 9bb2c07818
commit 4803730d80
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/http_host/download_tiles.py
View File

@@ -97,7 +97,7 @@ def download(area: str, version: str, runs_dir: Path) -> bool:
check=True,
)
subprocess.run(['unpigz', temp_dir / 'tiles.btrfs.gz'])
subprocess.run(['unpigz', temp_dir / 'tiles.btrfs.gz'], check=True)
btrfs_src = temp_dir / 'tiles.btrfs'
shutil.rmtree(version_dir, ignore_errors=True)

13
scripts/http_host/mounter.py
View File

@@ -73,11 +73,22 @@ def clean_up_mounts():
with open('/etc/fstab') as fp:
fstab_str = fp.read()
# handle deleted files
p = subprocess.run(['mount'], capture_output=True, text=True, check=True)
lines = [l for l in p.stdout.splitlines() if '/mnt/ofm/' in l and '(deleted)' in l]
for l in lines:
mnt_path = Path(l.split('(deleted) on ')[1].split(' type btrfs')[0])
assert mnt_path.exists()
subprocess.run(['umount', mnt_path], check=True)
mnt_path.rmdir()
# clean all mounts not in current fstab
for subdir in mnt_dir.iterdir():
if f'{subdir} ' in fstab_str:
continue
subprocess.run(['umount', subdir])
print(f'removing old mount {subdir}')
subprocess.run(['umount', subdir], check=True)
subdir.rmdir()