diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-21 23:44:54 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-21 23:44:54 +0100 |
| commit | 119fd58922b00d43d4f8b055f3f622478a13f46d (patch) | |
| tree | 4869f9f09079d5a33f7dfd51ca8e52200fbeb09f /gnu/build/linux-boot.scm | |
| parent | 85ba5e9335207beef9a650e96d5d64787beb9256 (diff) | |
| parent | bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e (diff) | |
| download | guix-119fd58922b00d43d4f8b055f3f622478a13f46d.tar.gz | |
Merge branch 'ungrafting' into staging
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 |