diff options
| author | Jack Hill <jackhill@jackhill.us> | 2021-07-08 22:48:53 -0400 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-09-04 02:00:00 +0200 |
| commit | ec16f88522041dc285a35705ff9ee95672b78143 (patch) | |
| tree | 9c3e369064afb28221423e46330a555425f7ce14 /gnu/build | |
| parent | 0f88acb9fa8f7bbdfb2a647907fe63b1974ab824 (diff) | |
| download | guix-patches-ec16f88522041dc285a35705ff9ee95672b78143.tar guix-patches-ec16f88522041dc285a35705ff9ee95672b78143.tar.gz | |
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>
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/linux-boot.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 7d41537652..84726363c0 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -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. |