make toml define variable processing order

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

Author: desultory

src/ugrd/base/core.toml

@@ -46,25 +46,25 @@ minor = 1
 "ugrd.base.core" = [ "configure_library_paths" ]
 
 [custom_parameters]
-binaries = "NoDupFlatList"  # Binaries which should be included in the intiramfs, dependencies resolved with lddtree
+hostonly = "bool"  # If true, the initramfs will be built specifically for the host building it
+validate = "bool"  # If true, the configuration of the initramfs will be validated against the host
+_file_owner_uid = "int"  # Add the _file_owner_uid property, used to store the uid of the file owner
+_custom_init_file = "str"  # Add the _custom_init_file propety, used to set where the custom init file is located
+build_dir = "Path"  # The directory where the initramfs is built
+build_logging = "bool" # If true, additional build information will be logged to the console
+_build_log_level = "int"  # The level of logging to use for the build log, set to 10 by default and incremeted by if build_log is true (min 20)
+symlinks = "dict"  # Symlinks dict, defines the symlinks to be made in the initramfs
 dependencies = "NoDupFlatList"  # Dependencies, used to define the dependencies of the initramfs
 opt_dependencies = "NoDupFlatList"  # Optional dependencies, which will be included if they are found
 gz_dependencies = "NoDupFlatList"  # GZipped dependencies property, used to define the gzipped dependencies (will be extracted)
 library_paths = "NoDupFlatList"  # library_paths property, used to define the library paths to add to LD_LIBRARY_PATH
-symlinks = "dict"  # Symlinks dict, defines the symlinks to be made in the initramfs
+binaries = "NoDupFlatList"  # Binaries which should be included in the intiramfs, dependencies resolved with lddtree
 copies = "dict"  # Copies dict, defines the files to be copied to the initramfs
 nodes = "dict"  # Nodes dict, defines the device nodes to be created
 paths = "NoDupFlatList"  # Paths to be created in the initramfs
 masks = "dict"  # Imports to be masked in the initramfs
-build_dir = "Path"  # The directory where the initramfs is built
-build_logging = "bool" # If true, additional build information will be logged to the console
-_build_log_level = "int"  # The level of logging to use for the build log, set to 10 by default and incremeted by if build_log is true (min 20)
 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
 clean = "bool"  # Add the clean property, used to define if the mounts should be cleaned up after boot
-hostonly = "bool"  # If true, the initramfs will be built specifically for the host building it
-validate = "bool"  # If true, the configuration of the initramfs will be validated against the host
 file_owner = "str"  # Add the file_owner property, used to define who should own the copied initramfs files
-_file_owner_uid = "int"  # Add the _file_owner_uid property, used to store the uid of the file owner
-_custom_init_file = "str"  # Add the _custom_init_file propety, used to set where the custom init file is located
 

src/ugrd/fs/btrfs.py

@@ -80,11 +80,9 @@ def autodetect_root_subvol(self):
 
 
 @check_dict('subvol_selector', value=True, message="subvol_selector not enabled, skipping")
+@check_dict('root_subvol', unset=True, message="root_subvol is set, skipping.")
 def select_subvol(self) -> str:
     """ Returns a bash script to list subvolumes on the root volume. """
-    if self['root_subvol']:
-        self.logger.warning("root_subvol is set, skipping subvolume selection.")
-        return
     return [f'mount -t btrfs -o subvolid=5,ro $(cat /run/MOUNTS_ROOT_SOURCE) {self["_base_mount_path"]}',
             f'''if [ -z "$(btrfs subvolume list -o {self['_base_mount_path']})" ]; then''',
             f'''    echo "Failed to list btrfs subvolumes for root volume: {self['_base_mount_path']}"''',

src/ugrd/fs/btrfs.toml

@@ -17,6 +17,6 @@ autodetect_root_subvol = true
 # Custom parameters
 [custom_parameters]
 _base_mount_path = "Path"  # Set the mount point for the root filesystem when used to check for subvols
-subvol_selector = "bool"  # Select a btrfs subvolume for the root partition at runtime
 root_subvol = "str"  # Set the default btrfs subvolume for the root filesystem
+subvol_selector = "bool"  # Select a btrfs subvolume for the root partition at runtime
 autodetect_root_subvol = "bool"  # Automatically detect the root subvolume

src/ugrd/initramfs_dict.py

@@ -1,6 +1,6 @@
 
 __author__ = "desultory"
-__version__ = "1.0.2"
+__version__ = "1.1.0"
 
 from tomllib import load, TOMLDecodeError
 from pathlib import Path
@@ -75,7 +75,7 @@ def __setitem__(self, key: str, value) -> None:
             self.logger.debug("[%s] Custom types: %s" % (key, self['custom_parameters'].keys()))
             # for anything but the logger, add to the processing queue
             if key != 'logger':
-                self.logger.warning("Adding unknown internal parameter to processing queue: %s" % key)
+                self.logger.debug("Adding unknown internal parameter to processing queue: %s" % key)
                 if key not in self['_processing']:
                     self['_processing'][key] = Queue()
                 self['_processing'][key].put(value)
@@ -105,10 +105,10 @@ def _process_custom_parameters(self, parameter_name: str, parameter_type: type)
             self.logger.debug("Leaving '%s' as None" % parameter_name)
 
         if parameter_name in self['_processing']:
-            self.logger.info("Processing queued values for '%s'" % parameter_name)
+            self.logger.debug("Processing queued values for '%s'" % parameter_name)
             while not self['_processing'][parameter_name].empty():
                 value = self['_processing'][parameter_name].get()
-                self.logger.info("Processing queued value for '%s': %s" % (parameter_name, value))
+                self.logger.debug("Processing queued value for '%s': %s" % (parameter_name, value))
                 self[parameter_name] = value
             self['_processing'].pop(parameter_name)
 
@@ -206,20 +206,20 @@ def _process_modules(self, module: str) -> None:
             except TOMLDecodeError as e:
                 raise TOMLDecodeError("Unable to load module config: %s" % module) from e
 
-        # Import these first, as they affect how the rest of the config is processed
-        early_imports = ['imports', 'custom_parameters']
-        for import_type in early_imports:
-            if import_type in module_config:
-                self[import_type] = module_config[import_type]
-                self.logger.debug("[%s] Registered %s: %s" % (module, import_type, self[import_type]))
-
+        # First import all variabled, then import processing functions/imports in order
+        processing_imports = ['imports', 'custom_parameters']
         for name, value in module_config.items():
-            if name in early_imports:
+            if name in processing_imports:
                 self.logger.log(5, "[%s] Skipping '%s'" % (module, name))
                 continue
             self.logger.debug("[%s] Setting '%s' to: %s" % (module, name, value))
             self[name] = value
 
+        for import_type in processing_imports:
+            if import_type in module_config:
+                self[import_type] = module_config[import_type]
+                self.logger.debug("[%s] Registered %s: %s" % (module, import_type, self[import_type]))
+
         # Append the module to the list of loaded modules, avoid recursion
         self['modules'].append(module)