diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-12-15 21:55:34 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-12-17 23:01:23 +0100 |
| commit | 2072f617adfbdb2ab6ba032158ecc7eb75a150ec (patch) | |
| tree | 68828b4d1eb185b478008f0e45d4b646e32456da /gnu/build | |
| parent | 59d97bb4598c7b513733b97fcc5185be33da531a (diff) | |
| download | guix-2072f617adfbdb2ab6ba032158ecc7eb75a150ec.tar guix-2072f617adfbdb2ab6ba032158ecc7eb75a150ec.tar.gz | |
linux-boot: Fix noresume argument parsing.
* gnu/build/linux-boot.scm (boot-system): Check for "hibernate=noresume"
in addition to "noresume".
Diffstat (limited to 'gnu/build')
| -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 |