Merge pull request #219 from desultory/dev

improve mount detection for late mounts

Author: desultory

src/ugrd/fs/mounts.py

@@ -410,37 +410,6 @@ def get_zpool_info(self, poolname=None) -> Union[dict, None]:
         return self["_zpool_info"][poolname]
 
 
-@contains("hostonly", "Skipping init mount autodetection, hostonly mode is disabled.", log_level=30)
-@contains("autodetect_init_mount", "Init mount autodetection disabled, skipping.", log_level=30)
-@contains("init_target", "init_target must be set", raise_exception=True)
-def autodetect_init_mount(self) -> None:
-    """Checks the parent directories of init_target, if the path is a mountpoint, add it to late_mounts."""
-    init_mount = _find_mountpoint(self, self["init_target"])
-    if init_mount == "/":
-        return
-
-    if init_mount in self["late_mounts"]:
-        return self.logger.debug("Init mount already detected: %s" % init_mount)
-
-    if init_mount not in self["_mounts"]:
-        raise AutodetectError("Init mount not found in host mounts: %s" % init_mount)
-
-    self.logger.info("Detected init mount: %s" % colorize(init_mount, "cyan"))
-    mount_name = init_mount.removeprefix("/")
-    mount_dest = init_mount
-    mount_device = self["_mounts"][init_mount]["device"]
-    mount_type = self["_mounts"][init_mount]["fstype"]
-    mount_options = self["_mounts"][init_mount]["options"]
-    blkid_info = self["_blkid_info"][mount_device]
-    mount_source_type, mount_source = _get_mount_source_type(self, blkid_info, with_val=True)
-    self["late_mounts"][mount_name] = {
-        "destination": mount_dest,
-        mount_source_type: mount_source,
-        "type": mount_type,
-        "options": mount_options,
-    }
-
-
 @contains("hostonly", "Skipping virtual block device enumeration, hostonly mode is disabled.", log_level=30)
 def get_virtual_block_info(self) -> dict:
     """Populates the virtual block device info. (previously device mapper only)
@@ -673,6 +642,28 @@ def autodetect_luks(self, source_dev, dm_num, blkid_info) -> None:
     )
 
 
+@contains("hostonly", "Skipping init mount autodetection, hostonly mode is disabled.", log_level=30)
+@contains("autodetect_init_mount", "Init mount autodetection disabled, skipping.", log_level=30)
+@contains("init_target", "init_target must be set", raise_exception=True)
+def autodetect_init_mount(self) -> None:
+    """Checks the parent directories of init_target, if the path is a mountpoint, add it to late_mounts."""
+    for mountpoint in ["/usr", "/var", "/etc"]:
+        _autodetect_mount(self, mountpoint, "late_mounts", missing_ok=True)
+
+    init_mount = _find_mountpoint(self, self["init_target"])
+    if init_mount == "/":
+        return
+
+    if init_mount in self["late_mounts"]:
+        return self.logger.debug("Init mount already detected: %s" % init_mount)
+
+    if init_mount not in self["_mounts"]:
+        raise AutodetectError("Init mount not found in host mounts: %s" % init_mount)
+
+    self.logger.info("Detected init mount: %s" % colorize(init_mount, "cyan"))
+    _autodetect_mount(self, init_mount, "late_mounts")
+
+
 @contains("autodetect_root", "Skipping root autodetection, autodetect_root is disabled.", log_level=30)
 @contains("hostonly", "Skipping root autodetection, hostonly mode is disabled.", log_level=30)
 def autodetect_root(self) -> None:
@@ -697,11 +688,14 @@ def autodetect_root(self) -> None:
             _autodetect_dm(self, "/")
 
 
-def _autodetect_mount(self, mountpoint) -> str:
-    """Sets mount config for the specified mountpoint.
+def _autodetect_mount(self, mountpoint, mount_class="mounts", missing_ok=False) -> str:
+    """Sets mount config for the specified mountpoint, in the specified mount class.
+
     Returns the "real" device path for the mountpoint.
     """
     if mountpoint not in self["_mounts"]:
+        if missing_ok:
+            return self.logger.debug("Mountpoint not found in host mounts: %s" % mountpoint)
         self.logger.error("Host mounts:\n%s" % pretty_print(self["_mounts"]))
         raise AutodetectError("auto_mount mountpoint not found in host mounts: %s" % mountpoint)
 
@@ -728,24 +722,25 @@ def _autodetect_mount(self, mountpoint) -> str:
     mount_name = "root" if mountpoint == "/" else mountpoint.removeprefix("/")
 
     # Don't overwrite existing mounts if a source type is already set
-    if mount_name in self["mounts"] and any(s_type in self["mounts"][mount_name] for s_type in SOURCE_TYPES):
+    if mount_name in self[mount_class] and any(s_type in self[mount_class][mount_name] for s_type in SOURCE_TYPES):
         return self.logger.warning(
             "[%s] Skipping autodetection, mount config already set:\n%s"
-            % (colorize(mountpoint, "yellow"), pretty_print(self["mounts"][mount_name]))
+            % (colorize(mountpoint, "yellow"), pretty_print(self[mount_class][mount_name]))
         )
 
-    mount_config = {mount_name: {"type": "auto", "options": ["ro"]}}  # Default to auto and ro
+    # For standard mounts, default to auto and ro
+    if mount_class == "mounts":
+        mount_config = {mount_name: {"options": ["ro"]}}
+    else:  # For other mounts, use the existing mount config
+        mount_config = {mount_name: {"options": self["_mounts"][mountpoint].get("options", ["default"])}}
+
     fs_type = mount_info.get("type", fs_type) or "auto"
     if fs_type == "auto":
         self.logger.warning("Failed to autodetect mount type for mountpoint:" % (colorize(mountpoint, "yellow")))
     else:
         self.logger.info("[%s] Autodetected mount type from device: %s" % (mount_device, colorize(fs_type, "cyan")))
     mount_config[mount_name]["type"] = fs_type.lower()
 
-    # for zfs mounts, set the path to the pool name
-    if fs_type == "zfs":
-        mount_config[mount_name]["path"] = mount_device
-
     for source_type in SOURCE_TYPES:
         if source := mount_info.get(source_type):
             self.logger.info(
@@ -758,7 +753,11 @@ def _autodetect_mount(self, mountpoint) -> str:
         if fs_type != "zfs":  # For ZFS, the source is the pool name
             raise AutodetectError("[%s] Failed to autodetect mount source." % mountpoint)
 
-    self["mounts"] = mount_config
+    # for zfs mounts, set the path to the pool name
+    if fs_type == "zfs":
+        mount_config[mount_name]["path"] = mount_device
+
+    self[mount_class] = mount_config
     return mount_device
 
 

src/ugrd/fs/mounts.toml

@@ -21,7 +21,6 @@ autodetect_root_luks = true
 autodetect_root_lvm = true
 autodetect_root_raid = true
 autodetect_init_mount = true
-late_fstab = "/etc/fstab.late"
 
 [imports.config_processing]
 "ugrd.fs.mounts" = [ "_process_run_dirs_multi",
@@ -48,7 +47,7 @@ late_fstab = "/etc/fstab.late"
 "ugrd.fs.mounts" = [ "mount_fstab" ]
 
 [imports.init_mount]
-"ugrd.fs.mounts" = [ "mount_root" ]
+"ugrd.fs.mounts" = [ "mount_root", "mount_late" ]
 
 [imports.functions]
 "ugrd.fs.mounts" = [ "mount_default_root" ]
@@ -65,7 +64,6 @@ mounts = "dict"  # Add the mounts property, used to define the mounts to be made
 mount_devpts = "bool"  # Whether or not to mount devpts
 run_dirs = "NoDupFlatList"  # A list of directories to be created under /run
 late_mounts = "dict"  # Like mounts, but run after the root is mounted
-late_fstab = "str"  # The path to the late_fstab file
 auto_mounts = "NoDupFlatList"  # A list of mounts to be automatically added to the mounts list
 mount_timeout = "float"  # The time to wait between mount attempts
 mount_retries = "int"  # The number of times to re-attempt mounting the fstab, infinite if not set