optional X-kvmd.otgmsd-* values

This commit is contained in:
Maxim Devaev 2022-06-13 21:10:51 +03:00
parent 6eb02a2bd5
commit 9769b2f754

View File

@ -56,11 +56,11 @@ def _find_storage(target: str) -> _Storage:
if line and not line.startswith("#"): if line and not line.startswith("#"):
parts = line.split() parts = line.split()
if len(parts) == 6: if len(parts) == 6:
options = dict(re.findall(r"X-kvmd\.%s-(root|user)=([^,]+)" % (target), parts[3])) options = dict(re.findall(r"X-kvmd\.%s-(root|user)(?:=([^,]+))?" % (target), parts[3]))
if options: if options:
return _Storage( return _Storage(
mount_path=parts[1], mount_path=parts[1],
root_path=options.get("root", ""), root_path=(options.get("root", "") or parts[1]),
user=options.get("user", ""), user=options.get("user", ""),
) )
raise SystemExit(f"Can't find {target!r} mountpoint in {_FSTAB_PATH}") raise SystemExit(f"Can't find {target!r} mountpoint in {_FSTAB_PATH}")