updated custom_init mechanism, added soruce to custom_init

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

Author: desultory

readme.md

@@ -540,47 +540,42 @@ Finally, like the standard init build, the `init_final` is written to the main `
 "ugrd.base.console" = [ "custom_init" ]
 ```
 
-The custom init works by creating an `init_main` file and returning a config line which will execute that file in a getty session.
-This `init_main` file contains everything that would be in the standard init file, but without the `init_pre` and `init_final` portions. 
+The `custom_init` function should return a tuple with the line used to call the custom init file, and the contents of it.
 
 
 ```
-
-def custom_init(self):
+def custom_init(self) -> str:
     """
-    init override
+    init override for the console module.
+    Write the main init runlevels to the self.config_dict['_custom_init_file'] file.
+    Returns the output of console_init which is the command to start agetty.
     """
     custom_init_contents = [self.config_dict['shebang'],
                             f"# Console module version v{__version__}"]
     custom_init_contents += self.generate_init_main()
 
-    self._write("init_main.sh", custom_init_contents, 0o755)
-
-    return console_init(self)
+    return console_init(self), custom_init_contents
 
 
-def console_init(self):
+def console_init(self) -> str:
     """
-    start agetty
+    Start agetty on the primary console.
+    Tell it to execute teh _custom_init_file
+    If the console is a serial port, set the baud rate.
     """
     name = self.config_dict['primary_console']
-    out_str = f"agetty --autologin root --login-program /init_main.sh {name}"
-
     console = self.config_dict['console'][name]
 
-    if console.get('local'):
-        out_str += " -L"
+    out_str = f"agetty --autologin root --login-program {self.config_dict['_custom_init_file']}"
 
     console_type = console.get('type', 'tty')
 
     if console_type != 'tty':
-        baud_rate = console['baud']
-        out_str += f" {console_type} {baud_rate}"
-    else:
-        out_str += f" {console_type}"
+        # This differs from usage in the man page but seems to work?
+        out_str += f" --local-line {console['baud']}"
+
+    out_str += f" {name} {console_type}"
 
     return out_str
 ```
 
-
-`self._write(file_name, contents, chmod)` should be used instead of manually writing to a file.

ugrd/base/console.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "0.4.2"
+__version__ = "0.5.0"
 
 
 def custom_init(self) -> str:
@@ -12,8 +12,7 @@ def custom_init(self) -> str:
                             f"# Console module version v{__version__}"]
     custom_init_contents += self.generate_init_main()
 
-    self._write(self.config_dict['_custom_init_file'], custom_init_contents, 0o755)
-    return console_init(self)
+    return console_init(self), custom_init_contents
 
 
 def console_init(self) -> str:

ugrd/initramfs_dict.py

@@ -115,6 +115,19 @@ def _process_imports(self, import_type: str, import_value: dict) -> None:
                 self.logger.log(5, "Creating import type: %s" % import_type)
                 self['imports'][import_type] = NoDupFlatList(log_bump=10, logger=self.logger, _log_init=False)
 
+            if import_type == 'custom_init':
+                if self['imports']['custom_init']:
+                    raise ValueError("Custom init function already defined: %s" % self['imports']['custom_init'])
+                else:
+                    self['imports']['custom_init'] = function_list[0]
+                    self.logger.info("Registered custom init function: %s" % function_list[0].__name__)
+                    continue
+
+            if import_type == 'funcs':
+                for function in function_list:
+                    if function.__name__ in self['imports']['funcs']:
+                        raise ValueError("Function '%s' already registered" % function.__name__)
+
             self['imports'][import_type] += function_list
             self.logger.debug("[%s] Updated import functions: %s" % (import_type, function_list))
 
@@ -123,11 +136,6 @@ def _process_imports(self, import_type: str, import_value: dict) -> None:
                     self['custom_processing'][function.__name__] = function
                     self.logger.debug("Registered config processing function: %s" % function.__name__)
 
-            if import_type == 'funcs':
-                for function in function_list:
-                    if function.__name__ in self['imports']['funcs']:
-                        raise ValueError("Function '%s' already registered" % function.__name__)
-
     @handle_plural
     def _process_mod_depends(self, module: str) -> None:
         """

ugrd/initramfs_generator.py

@@ -215,7 +215,8 @@ def generate_init(self) -> None:
 
         if self.config_dict['imports'].get('custom_init'):
             init += ["\n\n# !!custom_init"]
-            init.extend(self._run_hook('custom_init'))
+            init_line, custom_init = self.config_dict['imports']['custom_init'](self)
+            init.append(init_line)
         else:
             init.extend(self.generate_init_main())
 
@@ -226,6 +227,12 @@ def generate_init(self) -> None:
             init_funcs = self.generate_init_funcs()
             self._write('init_funcs.sh', init_funcs, 0o755)
             init.insert(2, "source /init_funcs.sh")
+            if custom_init:
+                custom_init.insert(2, "source /init_funcs.sh")
+
+        if custom_init:
+            self._write('_custom_init_file', custom_init, 0o755)
+            init += custom_init
 
         self._write('init', init, 0o755)
         self.logger.debug("Final config:\n%s" % pretty_print(self.config_dict))