don't include build function output in profile, improve dm autodetection

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

Author: desultory

src/ugrd/fs/mounts.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '4.16.2'
+__version__ = '4.16.3'
 
 from pathlib import Path
 from zenlib.util import contains, pretty_print
@@ -205,7 +205,7 @@ def get_mounts_info(self) -> None:
 
 
 @contains('hostonly', "Skipping blkid autodetection, hostonly mode is enabled.", log_level=30)
-def get_blkid_info(self, device=None) -> str:
+def get_blkid_info(self, device=None) -> dict:
     """
     Gets the blkid info for all devices if no device is passed.
     Gets the blkid info for the passed device if a device is passed.
@@ -233,6 +233,7 @@ def get_blkid_info(self, device=None) -> str:
         raise ValueError("[%s] Failed to parse blkid info: %s" % (device, info))
 
     self.logger.debug("Blkid info: %s" % pretty_print(self['_blkid_info']))
+    return self['_blkid_info'][device] if device else self['_blkid_info']
 
 
 @contains('init_target', 'init_target must be set', raise_exception=True)
@@ -327,11 +328,17 @@ def _autodetect_dm(self, mountpoint, device=None) -> None:
         self.logger.debug("Mount is not a device mapper mount: %s" % source_device)
         return
 
+    device_name = source_device.split('/')[-1]
     if source_device not in self['_blkid_info']:
-        device_name = source_device.split('/')[-1]
-        mapped_device = f'/dev/mapper/{device_name}'
-        if mapped_device not in self['_blkid_info']:
-            raise FileNotFoundError("[%s] No blkid info for virtual device: %s" % (mountpoint, device_name))
+        if device_name in self['_dm_info']:
+            if f'/dev/{device_name}' in self['_blkid_info']:
+                source_device = f'/dev/{device_name}'
+            elif f'/dev/mapper/{device_name}' in self['_blkid_info']:
+                source_device = f'/dev/mapper/{device_name}'
+            elif not get_blkid_info(self, source_device):
+                raise FileNotFoundError("[%s] No blkid info for virtual device: %s" % (mountpoint, source_device))
+        else:
+            raise ValueError("[%s] No blkid info for virtual device: %s" % (mountpoint, source_device))
 
     self.logger.info("[%s] Detected virtual block device: %s" % (mountpoint, source_device))
     source_device = Path(source_device)

src/ugrd/initramfs_generator.py

@@ -75,14 +75,14 @@ def build(self) -> None:
         self.logger.info("Building initramfs")
         for hook in self.build_tasks:
             self.logger.debug("Running build hook: %s" % hook)
-            self.run_hook(hook)
+            self.run_hook(hook, force_exclude=True)
         self.generate_init()
         self.run_hook('build_final')
         self.pack_build()
         self.run_checks()
         self.run_tests()
 
-    def run_func(self, function, force_include=False) -> list[str]:
+    def run_func(self, function, force_include=False, force_exclude=False) -> list[str]:
         """ Runs a function, If force_include is set, forces the function to be included in the bash source file. """
         self.logger.log(self['_build_log_level'], "Running function: %s" % function.__name__)
 
@@ -102,9 +102,12 @@ def run_func(self, function, force_include=False) -> list[str]:
                 self.logger.debug("[%s] Function returned string: %s" % (function.__name__, function_output))
                 return function_output
 
-            self.logger.debug("[%s] Function returned output: %s" % (function.__name__, pretty_print(function_output)))
-            self.included_functions[function.__name__] = function_output
-            self.logger.debug("Created function alias: %s" % function.__name__)
+            if not force_exclude:
+                self.logger.debug("[%s] Function returned output: %s" % (function.__name__, pretty_print(function_output)))
+                self.included_functions[function.__name__] = function_output
+                self.logger.debug("Created function alias: %s" % function.__name__)
+            elif function_output:
+                self.logger.debug("[%s] Function output was not included: %s" % (function.__name__, function_output))
             return function.__name__
         else:
             self.logger.debug("[%s] Function returned no output" % function.__name__)
@@ -151,7 +154,7 @@ def generate_profile(self) -> None:
                 for line in func_content:
                     out.append(f"    {line}")
             else:
-                raise TypeError("Function content is not a string or list: %s" % func_content)
+                raise TypeError("[%s] Function content is not a string or list: %s" % (func_name, func_content))
             out.append("}")
 
         return out