diff options
| author | Marius Bakke <[email protected]> | 2020-12-21 23:42:10 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-12-21 23:42:10 +0100 |
| commit | bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e (patch) | |
| tree | 9fbf0642fe71d0d4f6d7cb4e85b4d1587c8b9b16 /gnu/build/linux-boot.scm | |
| parent | 034cfbd2449387c15823cd9ec3e91661f9e5bf49 (diff) | |
| parent | f00e68ace070fd5240a4b5874e61c26f6e909b6c (diff) | |
Merge branch 'master' into ungrafting
Diffstat (limited to 'gnu/build/linux-boot.scm')
| -rw-r--r-- | gnu/build/linux-boot.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index bfaac9ec1f..f20eeaac9f 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -560,7 +560,10 @@ upon error." (load-linux-modules-from-directory linux-modules linux-module-directory) - (unless (member "noresume" args) + (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 |