improve build task flow, add build_deploy

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

Author: desultory

src/ugrd/base/core.toml

@@ -37,7 +37,7 @@ minor = 1
 [imports.build_pre]
 "ugrd.base.core" = [ "detect_tmpdir", "clean_build_dir", "find_libgcc" ]
 
-[imports.build_tasks]
+[imports.build_deploy]
 "ugrd.base.core" = [ "generate_structure",
 		     "deploy_dependencies",
 		     "deploy_xz_dependencies",

src/ugrd/crypto/cryptsetup.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '2.6.2'
+__version__ = '2.6.3'
 
 from zenlib.util import contains
 
@@ -183,7 +183,10 @@ def _validate_cryptsetup_device(self, mapped_name) -> None:
         else:
             raise ValueError("[%s] Unable to validate LUKS UUID: %s" % (mapped_name, cryptsetup_token))
 
-    for dep in self['dependencies']:
+    if 'Cipher:     aes-xts-plain64' in luks_info:
+        self['kernel_modules'] = 'crypto_xts'
+
+    for dep in self['dependencies']:  # Ensure argon is installed if argon2id is used
         if dep.name.startswith('libargon2.so'):
             break
     else:

src/ugrd/fs/mounts.toml

@@ -21,10 +21,11 @@ late_fstab = "/etc/fstab.late"
 "ugrd.fs.mounts" = [ "_process_mounts_multi", "_process_late_mounts_multi", "_process_mount_timeout" ]
 
 [imports.build_pre]
-"ugrd.fs.mounts" = [ "get_mounts_info", "get_virtual_block_info", "get_blkid_info", "autodetect_root", "autodetect_mounts", "autodetect_root_dm" ]
+"ugrd.fs.mounts" = [ "get_mounts_info", "get_virtual_block_info", "get_blkid_info",
+		     "autodetect_root", "autodetect_mounts", "autodetect_root_dm", "autodetect_init_mount" ]
 
 [imports.build_tasks]
-"ugrd.fs.mounts" = [ "autodetect_init_mount", "export_mount_info", "export_root_target" ]
+"ugrd.fs.mounts" = [ "export_mount_info", "export_root_target" ]
 
 [imports.build_final]
 "ugrd.fs.mounts" = [ "generate_fstab" ]

src/ugrd/initramfs_generator.py

@@ -15,8 +15,8 @@ def __init__(self, config='/etc/ugrd/config.toml', *args, **kwargs):
         # Used for functions that are added to the bash source file
         self.included_functions = {}
 
-        # Used for functions that are run as part of the build process, build_final is run after init generation
-        self.build_tasks = ['build_pre', 'build_tasks']
+        # Used for functions that are run as part of the build process
+        self.build_tasks = ['build_pre', 'build_tasks', 'build_deploy', 'build_final']
 
         # init_pre and init_final are run as part of generate_initramfs_main
         self.init_types = ['init_debug', 'init_early', 'init_main', 'init_late', 'init_premount', 'init_mount', 'init_mount_late', 'init_cleanup']
@@ -78,7 +78,6 @@ def build(self) -> None:
         self.config_dict.validate()
 
         self.generate_init()
-        self.run_hook('build_final')
         self.pack_build()
         self.run_checks()
         self.run_tests()

src/ugrd/kmod/kmod.toml

@@ -24,11 +24,12 @@ no_kmod = "bool" # Disables kernel modules entirely
 "ugrd.kmod.kmod" = [ "_process_kmod_init_multi", "_process_kernel_modules_multi", "_process__kmod_auto_multi" ]
 
 [imports.build_pre]
-"ugrd.kmod.kmod" = [ "get_kernel_metadata",
-		     "autodetect_modules",
-		     "process_modules", "process_ignored_modules", "process_module_metadata" ]
+"ugrd.kmod.kmod" = [ "get_kernel_metadata", "autodetect_modules" ]
 
 [imports.build_tasks]
+"ugrd.kmod.kmod" = [ "process_modules", "process_ignored_modules", "process_module_metadata" ]
+
+[imports.build_final]
 "ugrd.kmod.kmod" = [ "regen_kmod_metadata" ]
 
 [imports.init_pre]