move resume functionality into its own module

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

Author: desultory

src/ugrd/fs/mounts.py

@@ -742,20 +742,3 @@ def resolve_blkdev_kmod(self, device) -> list[str]:
         self.logger.error("[%s] Unable to determine kernel module for block device: %s" % (device_name, device))
         return []
 
-
-def handle_resume(self) -> None:
-    """Returns a bash script handling resume if specified.
-    Checks that /sys/power/resume is writable, and if resume= is set, if so,
-    it checks ifthe specified device exists, then echo's the resume device to /sys/power/resume."""
-    return [
-        'if [ -n "$(readvar resume)" ] && [ -w /sys/power/resume ]; then',
-        '    if [ -e "$(readvar resume)" ]; then',
-        '        einfo "Resuming from: $(readvar resume)"',
-        "        readvar resume > /sys/power/resume",
-        '        rd_fail "Failed to resume from $(readvar resume)"',
-        "    else",
-        '        ewarn "Resume device not found: $(readvar resume)"',
-        '        prompt_user "Press enter to continue booting."',
-        "    fi",
-        "fi",
-    ]

src/ugrd/fs/mounts.toml

@@ -9,7 +9,7 @@ binaries = [
 
 cmdline_bools = [ "rootwait" ]
 cmdline_strings = [
-  "root", "roottype", "rootflags", "rootdelay", "resume"
+  "root", "roottype", "rootflags", "rootdelay"
 ]
 
 mount_wait = false
@@ -38,8 +38,8 @@ late_fstab = "/etc/fstab.late"
 [imports.init_pre]
 "ugrd.fs.mounts" = [ "mount_base" ]
 
-[imports.init_early]
-"ugrd.fs.mounts" = [ "handle_resume", "mount_fstab" ]
+[imports.init_main]
+"ugrd.fs.mounts" = [ "mount_fstab" ]
 
 [imports.functions]
 "ugrd.fs.mounts" = [ "mount_root" ]

src/ugrd/fs/resume.py

@@ -0,0 +1,18 @@
+__version__ = "0.1.0"
+
+def handle_resume(self) -> None:
+    """Returns a bash script handling resume if specified.
+    Checks that /sys/power/resume is writable, and if resume= is set, if so,
+    it checks ifthe specified device exists, then echo's the resume device to /sys/power/resume."""
+    return [
+        'if [ -n "$(readvar resume)" ] && [ -w /sys/power/resume ]; then',
+        '    if [ -e "$(readvar resume)" ]; then',
+        '        einfo "Resuming from: $(readvar resume)"',
+        "        readvar resume > /sys/power/resume",
+        '        rd_fail "Failed to resume from $(readvar resume)"',
+        "    else",
+        '        ewarn "Resume device not found: $(readvar resume)"',
+        '        prompt_user "Press enter to continue booting."',
+        "    fi",
+        "fi",
+    ]

src/ugrd/fs/resume.toml

@@ -0,0 +1,4 @@
+cmdline_strings = [ "resume" ]
+
+[imports.init_early] 
+"ugrd.fs.resume" = [ "handle_resume" ]