standardize fail mechanism

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

Author: desultory

src/ugrd/base/base.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '4.1.1'
+__version__ = '4.2.0'
 
 from importlib.metadata import version
 from pathlib import Path
@@ -85,19 +85,15 @@ def do_switch_root(self) -> str:
             'fi',
             'echo "Checking root mount: $(readvar MOUNTS_ROOT_TARGET)"',
             'if ! grep -q " $(readvar MOUNTS_ROOT_TARGET) " /proc/mounts ; then',
-            '    ewarn "Root mount not found at: $(readvar MOUNTS_ROOT_TARGET)"',
-            r'    einfo "Current block devices:\n$(blkid)"',
-            '    prompt_user "Press enter to restart UGRD."',
-            '    exec /init',
+            '    rd_fail "Root not found at: $(readvar MOUNTS_ROOT_TARGET)"',
             'elif [ ! -e $(readvar SWITCH_ROOT_TARGET)$(readvar INIT_TARGET) ] ; then',
             '    ewarn "$(readvar INIT_TARGET) not found at: $(readvar SWITCH_ROOT_TARGET)"',
             r'    einfo "Target root contents:\n$(ls -l $(readvar SWITCH_ROOT_TARGET))"',
             '    if _find_init ; then',
             '        einfo "Switching root to: $(readvar SWITCH_ROOT_TARGET) $(readvar INIT_TARGET)"',
             '        exec switch_root "$(readvar SWITCH_ROOT_TARGET)" "$(readvar INIT_TARGET)"',
             '    fi',
-            '    prompt_user "Press enter to restart UGRD."',
-            '    exec /init',
+            '    rd_fail "Unable to find init."',
             'else',
             f'    einfo "Completed UGRD v{version("ugrd")}."',
             '    einfo "Switching root to: $(readvar SWITCH_ROOT_TARGET) $(readvar INIT_TARGET)"',
@@ -127,7 +123,7 @@ def rd_fail(self) -> list[str]:
             'else',
             '    ewarn "PID is not 1, exiting: $$"',
             '    exit',
-	   'fi']
+            'fi']
 
 
 def setvar(self) -> str:

src/ugrd/crypto/cryptsetup.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '1.9.0'
+__version__ = '2.0.0'
 
 from zenlib.util import check_dict
 
@@ -281,6 +281,11 @@ def crypt_init(self) -> list[str]:
                     f'    ewarn "Failed to open device using keys: {name}"']
             out += [f'    {bash_line}' for bash_line in open_crypt_device(self, name, new_params)]
             out += ['fi']
+        # Check that the device was successfully opened
+        out += [f'cryptsetup status {name}',
+                'if [ $? -ne 0 ]; then',
+                f'    rd_fail "Failed to open cryptsetup device: {name}"',
+                'fi']
     return out