48k.eu-mirror
/
ogclient
mirror of https://git.48k.eu/ogclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs: return unknown if blkid fails 

instead of rising an exception
master
OpenGnSys Support Team 2024-02-15 10:45:46 +01:00
parent bf7eb1542d
commit 8fb8a0a66d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/fs.py
View File

@ -97,6 +97,8 @@ def ogReduceFs(disk, part):
"""
partdev = get_partition_device(disk, part)
fstype = get_filesystem_type(partdev)
if fstype == "unknown":
return -1
umount(partdev)
if fstype == 'ext4':
@ -117,6 +119,8 @@ def ogExtendFs(disk, part):
"""
partdev = get_partition_device(disk, part)
fstype = get_filesystem_type(partdev)
if fstype == "unknown":
return -1
umount(partdev)
if fstype == 'ext4':
@ -198,7 +202,9 @@ def get_filesystem_type(partdev):
cmd = shlex.split(f'blkid -o value -s TYPE {partdev}')
proc = subprocess.run(cmd, stdout=PIPE, encoding='utf-8')
if proc.returncode != 0:
raise RuntimeError(f'Error getting filesystem from {partdev}')
log.error(f'Error getting filesystem from {partdev}')
return "unknown"
return proc.stdout.strip()