rename check_usr to handle_usr_symlinks, validate config after building

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

Author: desultory

src/ugrd/base/core.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '3.7.3'
+__version__ = '3.7.4'
 
 from pathlib import Path
 from typing import Union
@@ -67,9 +67,8 @@ def calculate_dependencies(self, binary: str) -> list[Path]:
     return dependency_paths
 
 
-def check_usr(self) -> None:
-    """ Checks for /bin and /sbin in the build directory.
-    If the are not present, it will symlink them to /usr/bin and /usr/sbin. """
+def handle_usr_symlinks(self) -> None:
+    """ Adds symlinks for /usr/bin and /usr/sbin to /bin and /sbin. """
     build_dir = self._get_build_path('/')
 
     if not (build_dir / 'bin').is_dir():

src/ugrd/base/core.toml

@@ -47,7 +47,7 @@ minor = 1
 		     "deploy_symlinks" ]
 
 [imports.build_final]
-"ugrd.base.core" = [ "check_usr" ]
+"ugrd.base.core" = [ "handle_usr_symlinks" ]
 
 [custom_parameters]
 hostonly = "bool"  # If true, the initramfs will be built specifically for the host building it

src/ugrd/initramfs_generator.py

@@ -30,7 +30,6 @@ def __init__(self, config='/etc/ugrd/config.toml', *args, **kwargs):
             self.logger.warning("[%s] Config file not found, using the base config." % config)
         except TOMLDecodeError as e:
             raise ValueError("[%s] Error decoding config file: %s" % (config, e))
-        self.config_dict.validate()
 
     def load_config(self, config_filename) -> None:
         """
@@ -76,6 +75,8 @@ def build(self) -> None:
         for hook in self.build_tasks:
             self.logger.debug("Running build hook: %s" % hook)
             self.run_hook(hook, force_exclude=True)
+        self.config_dict.validate()
+
         self.generate_init()
         self.run_hook('build_final')
         self.pack_build()