cleaned up failure handling

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

Author: desultory

ugrd/crypto/cryptsetup.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 
 _module_name = 'ugrd.crypto.cryptsetup'
 
@@ -101,7 +101,7 @@ def get_crypt_sources(self) -> list[str]:
 
         check_command = [f'if [ -z "$CRYPTSETUP_SOURCE_{name}" ]; then',
                          f'    echo "Unable to resolve device source for {name}"',
-                         '    exec /init',
+                         '    _mount_fail',
                          'else',
                          f'    echo "Resolved device source: $CRYPTSETUP_SOURCE_{name}"',
                          'fi']

ugrd/fs/mounts.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '1.2.2'
+__version__ = '1.3.0'
 
 from pathlib import Path
 
@@ -173,7 +173,7 @@ def mount_fstab(self) -> list[str]:
         else:
             out += ["read -sr"]
 
-    out += ["mount -a || (echo 'Failed to mount fstab' ; echo 'Loaded modules:' ; lsmod ; echo 'Block devices:' ; blkid ; mount_fstab)"]
+    out += ["mount -a || (echo 'Failed to mount fstab' ; _mount_fail)"]
     return out
 
 
@@ -281,3 +281,19 @@ def clean_mounts(self) -> list[str]:
     return ['umount -a'] + umounts
 
 
+def _mount_fail(self) -> list[str]:
+    """
+    Generates init lines to run if the mount fails
+    """
+    return ['echo "Loaded modules:"',
+            'lsmod',
+            'echo "Block devices:"',
+            'blkid',
+            'echo "Mounts:"',
+            'mount',
+            'echo -e "\n\n\nPress enter to restart init\n\n\n"',
+            'read -sr',
+            'clean_mounts',
+            'exec /init']
+
+

ugrd/fs/mounts.toml

@@ -31,7 +31,7 @@ mount_wait = false
 "ugrd.fs.mounts" = [ "mount_root" ]
 
 [imports.functions]
-"ugrd.fs.mounts" = [ "clean_mounts" ]
+"ugrd.fs.mounts" = [ "clean_mounts", "_mount_fail" ]
 
 [custom_parameters]
 mounts = "dict"  # Add the mounts property, used to define the mounts to be made in the fstab

ugrd/initramfs_generator.py

@@ -1,5 +1,7 @@
 
 __author__ = "desultory"
+__version__ = "0.11.2"
+
 
 from tomllib import load
 from typing import Union
@@ -11,10 +13,6 @@
 
 from ugrd.initramfs_dict import InitramfsConfigDict
 
-from importlib.metadata import version
-
-__version__ = version(__package__)
-
 
 @loggify
 class InitramfsGenerator: