[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: linux-boot: Fix noresume argument parsing.
|
From: |
guix-commits |
|
Subject: |
04/04: linux-boot: Fix noresume argument parsing. |
|
Date: |
Thu, 17 Dec 2020 17:01:53 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit 2072f617adfbdb2ab6ba032158ecc7eb75a150ec
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Dec 15 21:55:34 2020 +0100
linux-boot: Fix noresume argument parsing.
* gnu/build/linux-boot.scm (boot-system): Check for "hibernate=noresume"
in addition to "noresume".
---
gnu/build/linux-boot.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index bfaac9e..f20eeaa 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