~ruther/guix-local

ec16f88522041dc285a35705ff9ee95672b78143 — Jack Hill 5 years ago 0f88acb
linux-boot: Resume from hibernation after pre-boot.

* gnu/build/linux-boot.scm (boot-system): Call resume-if-hibernated
after pre-mount.

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
1 files changed, 9 insertions(+), 9 deletions(-)

M gnu/build/linux-boot.scm
M gnu/build/linux-boot.scm => gnu/build/linux-boot.scm +9 -9
@@ 589,15 589,6 @@ upon error."
        (load-linux-modules-from-directory linux-modules
                                           linux-module-directory)

        (unless (or (member "hibernate=noresume" args)
                    ;; Also handle the equivalent old-style argument.
                    ;; See Documentation/admin-guide/kernel-parameters.txt.
                    (member "noresume" args))
          ;; Try to resume immediately after loading (storage) modules
          ;; but before any on-disk file systems have been mounted.
          (false-if-exception           ; failure is not fatal
           (resume-if-hibernated (find-long-option "resume" args))))

        (when keymap-file
          (let ((status (system* "loadkeys" keymap-file)))
            (unless (zero? status)


@@ 631,6 622,15 @@ the root file system...\n" root-delay)
          (unless (pre-mount)
            (error "pre-mount actions failed")))

        (unless (or (member "hibernate=noresume" args)
                    ;; Also handle the equivalent old-style argument.
                    ;; See Documentation/admin-guide/kernel-parameters.txt.
                    (member "noresume" args))
          ;; Try to resume immediately after loading (storage) modules
          ;; but before any on-disk file systems have been mounted.
          (false-if-exception           ; failure is not fatal
           (resume-if-hibernated (find-long-option "resume" args))))

        (setenv "EXT2FS_NO_MTAB_OK" "1")

        ;; Mount the root file system.