make the fail function more generic

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

Author: desultory

src/ugrd/base/base.py

@@ -105,6 +105,31 @@ def do_switch_root(self) -> str:
             "fi"]
 
 
+def rd_fail(self) -> list[str]:
+    """ Function for when the initramfs fails to function. """
+    return ['if [ -n "$1" ]; then',
+            '    ewarn "Mount failed: $1"',
+            'else',
+            '    ewarn "Mount failed"',
+            'fi',
+            'prompt_user "Press enter to display debug info."',
+            r'einfo "Loaded modules:\n$(cat /proc/modules)"',
+            r'einfo "Block devices:\n$(blkid)"',
+            r'einfo "Mounts:\n$(mount)"',
+            'if [ "$(readvar RECOVERY_SHELL)" == "1" ]; then',
+            '    einfo "Entering recovery shell"',
+            '    bash -l',
+            'fi',
+            'prompt_user "Press enter to restart init."',
+            'if [ "$$" -eq 1 ]; then',
+            '    einfo "Restarting init"',
+            '    exec /init ; exit',
+            'else',
+            '    ewarn "PID is not 1, exiting: $$"',
+            '    exit',
+	   'fi']
+
+
 def setvar(self) -> str:
     """ Returns a bash function that sets a variable in /run/vars/{name}. """
     return ['if check_var debug; then',

src/ugrd/base/base.toml

@@ -18,7 +18,7 @@ autodetect_init = true
 "ugrd.base.base" = [ "export_init_target", "do_switch_root" ]
 
 [imports.functions]
-"ugrd.base.base" = [ "check_var", "setvar", "readvar", "prompt_user", "edebug", "einfo", "ewarn", "_find_init" ]
+"ugrd.base.base" = [ "check_var", "setvar", "readvar", "prompt_user", "edebug", "einfo", "ewarn", "rd_fail", "_find_init" ]
 
 [custom_parameters]
 init_target = "Path"  # Specifies the location of the system init file

src/ugrd/crypto/cryptsetup.py

@@ -155,7 +155,7 @@ def get_crypt_sources(self) -> list[str]:
         source_cmd = f'export CRYPTSETUP_SOURCE_{name}=$(blkid --match-token "$SOURCE_TOKEN_{name}" --match-tag PARTUUID --output device)'
 
         check_command = [f'if [ -z "$CRYPTSETUP_SOURCE_{name}" ]; then',
-                         f'    _mount_fail "Unable to resolve device source for {name}"',
+                         f'    rd_fail "Unable to resolve device source for {name}"',
                          'else',
                          f'    einfo "Resolved device source: $CRYPTSETUP_SOURCE_{name}"',
                          'fi']

src/ugrd/fs/mounts.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '4.2.2'
+__version__ = '4.3.0'
 
 from pathlib import Path
 from zenlib.util import check_dict, pretty_print
@@ -140,7 +140,7 @@ def _to_mount_cmd(self, mount: dict) -> str:
     if mount_type := mount.get('type'):
         mount_command += f" -t {mount_type}"
 
-    mount_command += f" || _mount_fail 'failed to mount: {mount['destination']}'"
+    mount_command += f" || rd_fail 'Failed to mount: {mount['destination']}'"
 
     out += [f"    {mount_command}",
             'else',
@@ -391,7 +391,7 @@ def mount_base(self) -> list[str]:
         if mount.get('base_mount'):
             out += _to_mount_cmd(self, mount)
     out += ['mkdir -p /run/vars',
-            f'einfo "Mounting base mounts, version: {__version__}"']
+            f'einfo "Mounted base mounts, version: {__version__}"']
     return out
 
 
@@ -425,7 +425,7 @@ def mount_fstab(self) -> list[str]:
         else:
             out += ['prompt_user "Press enter once devices have settled."']
 
-    out += ["mount -a || _mount_fail 'failed to mount fstab'"]
+    out += ["mount -a || rd_fail 'Failed to mount fstab'"]
     return out
 
 
@@ -480,29 +480,3 @@ def export_mount_info(self) -> None:
             f'setvar MOUNTS_ROOT_TYPE "{self["mounts"]["root"].get("type", "auto")}"',
             f'setvar MOUNTS_ROOT_OPTIONS "{",".join(self["mounts"]["root"]["options"])}"']
 
-
-def _mount_fail(self) -> list[str]:
-    """ Generates init lines to run if the mount fails. """
-    return ['if [ -n "$1" ]; then',
-            '    ewarn "Mount failed: $1"',
-            'else',
-            '    ewarn "Mount failed"',
-            'fi',
-            'prompt_user "Press enter to display debug info."',
-            r'einfo "Loaded modules:\n$(cat /proc/modules)"',
-            r'einfo "Block devices:\n$(blkid)"',
-            r'einfo "Mounts:\n$(mount)"',
-            'if [ "$(readvar RECOVERY_SHELL)" == "1" ]; then',
-            '    einfo "Entering recovery shell"',
-            '    bash -l',
-            'fi',
-            'prompt_user "Press enter to restart init."',
-            'if [ "$$" -eq 1 ]; then',
-            '    einfo "Restarting init"',
-            '    exec /init ; exit',
-            'else',
-            '    ewarn "PID is not 1, exiting: $$"',
-            '    exit',
-            'fi']
-
-

src/ugrd/fs/mounts.toml

@@ -38,9 +38,6 @@ late_fstab = "/etc/fstab.late"
 [imports.init_mount_late]
 "ugrd.fs.mounts" = [ "mount_late" ]
 
-[imports.functions]
-"ugrd.fs.mounts" = [ "_mount_fail" ]
-
 [custom_parameters]
 mounts = "dict"  # Add the mounts property, used to define the mounts to be made in the fstab
 late_mounts = "dict"  # Like mounts, but run after the root is mounted