fix regression in kver autodetection, fix autodetection in mounts

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

Author: desultory

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ugrd"
-version = "0.15.2"
+version = "0.15.3"
 authors = [
   { name="Desultory", email="[email protected]" },
 ]

src/ugrd/fs/mounts.py

@@ -63,6 +63,8 @@ def _process_mounts_multi(self, mount_name: str, mount_config) -> None:
             if 'ugrd.fs.btrfs' not in self['modules']:
                 self.logger.info("Auto-enabling btrfs module")
                 self['modules'] = 'ugrd.fs.btrfs'
+        else:
+            self.logger.debug("Unknown mount type: %s" % mount_type)
 
     self['mounts'][mount_name] = mount_config
     self.logger.debug("[%s] Added mount: %s" % (mount_name, mount_config))
@@ -165,21 +167,25 @@ def autodetect_root(self) -> None:
     self.logger.debug("Detected root mount info: %s" % root_mount_info)
 
     mount_data = root_mount_info.partition(':')[2].strip().split(' ')
-    root_dict = {key: value for key, value in (entry.split('=') for entry in mount_data)}
+    root_dict = {key: value.strip('"') for key, value in (entry.split('=') for entry in mount_data)}
+
+    mount_info = {'root': {'type': 'auto', 'base_mount': False}}
 
     if mount_type := root_dict.get('TYPE'):
         self.logger.info("Autodetected root type: %s" % mount_type)
-        self['mounts']['root']['type'] = mount_type.lower()
+        mount_info['root']['type'] = mount_type.lower()
 
     if label := root_dict.get('LABEL'):
         self.logger.info("Autodetected root label: %s" % label)
-        self['mounts']['root']['source'] = {'label': label}
+        mount_info['root']['source'] = {'label': label}
     elif uuid := root_dict.get('UUID'):
         self.logger.info("Autodetected root uuid: %s" % uuid)
-        self['mounts']['root']['source'] = {'uuid': uuid}
+        mount_info['root']['source'] = {'uuid': uuid}
     else:
         raise ValueError("Failed to autodetect root mount source.")
 
+    self['mounts'] = mount_info
+
 
 def mount_base(self) -> list[str]:
     """ Generates mount commands for the base mounts. """

src/ugrd/kmod/kmod.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 
 from pathlib import Path
 from subprocess import run
@@ -170,7 +170,7 @@ def get_lsmod_modules(self) -> list[str]:
     if not self['hostonly']:
         raise RuntimeError("lsmod module resolution is only available in hostonly mode")
 
-    if self['kernel_version'] and self['kernel_version'] != uname().release:
+    if self.get('kernel_version') and self['kernel_version'] != uname().release:
         self.logger.warning("Kernel version is set to %s, but the current kernel version is %s" % (self['kernel_version'], uname().release))
 
     try: