fix argument parsing for no-autodetect-luks, improve mounts error

handling

Signed-off-by: Zen <[email protected]>

Author: desultory

pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "zenlib >= 2.0.3",
+    "zenlib >= 2.0.4",
     "pycpio >= 1.0.0"
 ]
 

src/ugrd/fs/mounts.py

@@ -423,7 +423,7 @@ def mount_root(self) -> str:
             'mount "$(cat /run/MOUNTS_ROOT_SOURCE)" "$(cat /run/MOUNTS_ROOT_TARGET)" -o "$(cat /run/MOUNTS_ROOT_OPTIONS)"']
 
 
-@check_dict({'mounts': {'root': 'source'}}, log_level=20, raise_exception=True, message="Root mount source is not defined.")
+@check_dict({'mounts': {'root': 'source'}}, not_empty=True, log_level=20, raise_exception=True, message="Root mount source is not defined.")
 def export_mount_info(self) -> None:
     """ Exports mount info based on the config to /run/MOUNTS_ROOT_{option} """
     return [f'echo -n "{self["mounts"]["root"]["destination"]}" > "/run/MOUNTS_ROOT_TARGET"',

src/ugrd/main.py

@@ -24,7 +24,7 @@ def main():
                  {'flags': ['--autodetect-root'], 'action': 'store_true', 'help': 'Autodetect the root partition.'},
                  {'flags': ['--no-autodetect-root'], 'action': 'store_false', 'help': 'Do not autodetect the root partition.', 'dest': 'autodetect_root'},
                  {'flags': ['--autodetect-root-luks'], 'action': 'store_true', 'help': 'Autodetect LUKS volumes under the root partition.'},
-                 {'flags': ['--no-autodetect-root-luks'], 'action': 'store_false', 'help': 'Do not autodetect root LUKS volumes.', 'dest': 'autodetect_root'},
+                 {'flags': ['--no-autodetect-root-luks'], 'action': 'store_false', 'help': 'Do not autodetect root LUKS volumes.', 'dest': 'autodetect_root_luks'},
                  {'flags': ['--print-config'], 'action': 'store_true', 'help': 'Print the final config dict.'},
                  {'flags': ['out_file'], 'action': 'store', 'help': 'Output file location', 'nargs': '?'}]