mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 11:29:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-boot: Resume from hibernation after pre-boot.

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

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
This commit is contained in:
Jack Hill 2021-07-08 22:48:53 -04:00 • committed by Tobias Geerinckx-Rice
parent 0f88acb9fa
commit ec16f88522
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/build/linux-boot.scm
View file

@ -589,15 +589,6 @@ upon error."
(load-linux-modules-from-directory linux-modules (load-linux-modules-from-directory linux-modules
linux-module-directory) 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 (when keymap-file
(let ((status (system* "loadkeys" keymap-file))) (let ((status (system* "loadkeys" keymap-file)))
(unless (zero? status) (unless (zero? status)
@ -631,6 +622,15 @@ the root file system...\n" root-delay)
(unless (pre-mount) (unless (pre-mount)
(error "pre-mount actions failed"))) (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") (setenv "EXT2FS_NO_MTAB_OK" "1")
;; Mount the root file system. ;; Mount the root file system.