fixed masking behavior, root subvol selection

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

Author: desultory

ugrd/base/core.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '1.2.4'
+__version__ = '1.3.0'
 
 from pathlib import Path
 from typing import Union
@@ -279,3 +279,38 @@ def _process_file_owner(self, owner: Union[str, int]) -> None:
         self.logger.error("Unable to process file owner: %s" % owner)
         raise ValueError("Invalid type passed for file owner: %s" % type(owner))
 
+
+def _process_masks_multi(self, runlevel: str, function: str) -> None:
+    """
+    Processes a mask.
+    """
+    self.logger.debug("[%s] Adding mask: %s" % (runlevel, function))
+    self['masks'][runlevel] = function
+
+    if runlevel not in self['imports']:
+        self.logger.warning("[%s] Runlevel not found in imports, skipping deletion: %s" % (runlevel, function))
+    else:
+        for func in self['imports'][runlevel]:
+            if func.__name__ == function:
+                self['imports'][runlevel].remove(func)
+                self.logger.info("[%s] Removing function from runlevel: %s" % (runlevel, function))
+                break
+        else:
+            self.logger.warning("[%s] Function not found in runlevel, skipping deletion: %s" % (runlevel, function))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

ugrd/base/core.toml

@@ -21,6 +21,7 @@ minor = 1
 		     "_process_file_owner",
 		     "_process_nodes_multi",
 		     "_process_paths_multi",
+		     "_process_masks_multi",
 		   ]
 
 [imports.build_pre]
@@ -40,6 +41,7 @@ symlinks = "dict"  # Add the symlinks property, used to define the symlinks to b
 copies = "dict"  # Add the copies property, used to define the files to be copied to the initramfs
 nodes = "dict"  # Add the nodes property, used to define the device nodes to be created
 paths = "NoDupFlatList"  # Paths to be copied to the initramfs
+masks = "dict"  # Imports to be masked in the initramfs
 build_dir = "Path"  # The directory where the initramfs is built
 out_dir = "Path"  # The directory where the initramfs is packed/output. If no packer is used, this is the final output directory.
 old_count = "int"  # The number of times to cycle old files before deleting

ugrd/fs/btrfs.py

@@ -79,6 +79,7 @@ def set_root_subvol(self) -> str:
     sets $root_subvol
     """
     if root_subvol := self.config_dict.get("root_subvol"):
+        self.config_dict['masks'] = {'init_mount': 'mount_root'}
         return f"export root_subvol={root_subvol}"
     elif self.config_dict.get('subvol_selector'):
         base_mount_path = self.config_dict['base_mount_path']

ugrd/initramfs_dict.py

@@ -25,7 +25,6 @@ class InitramfsConfigDict(dict):
     builtin_parameters = {'mod_depends': NoDupFlatList,  # Modules required by other modules, will be re-checked calling .verify_deps()
                           'modules': NoDupFlatList,  # A list of the names of modules which have been loaded, mostly used for dependency checking
                           'imports': dict,  # A dict of functions to be imported into the initramfs, under their respective hooks
-                          'mask': dict,  # A dict of imported functions to be masked
                           'custom_parameters': dict,  # Custom parameters loaded from imports
                           'custom_processing': dict,  # Custom processing functions which will be run to validate and process parameters
                           '_processing': dict}  # A dict of queues containing parameters which have been set before the type was known
@@ -221,12 +220,14 @@ def verify_mask(self) -> None:
         """
         Processes masked imports
         """
-        for mask_hook, mask_items in self['mask'].items():
-            if self['imports'].get(mask_hook):
-                for function in self['imports'][mask_hook]:
+        for mask_hook, mask_items in self['masks'].items():
+            if runlevel := self['imports'].get(mask_hook):
+                for function in runlevel.copy():
                     if function.__name__ in mask_items:
-                        self.logger.warning("Masking import: %s" % function.__name__)
-                        self['imports'][mask_hook].remove(function)
+                        runlevel.remove(function)
+                        self.logger.warning("[%s] Masking import: %s" % (mask_hook, function.__name__))
+                    else:
+                        self.logger.debug("[%s] Import not found: %s" % (mask_hook, function.__name__))
 
     def __str__(self) -> str:
         return pretty_print(self)