diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-07 18:20:23 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-07 18:20:23 +0200 |
| commit | 6cfb2e6270b2759fb98a0de665235bcbb9b9eccf (patch) | |
| tree | 83c467772a94cbf72f96b26b08f0a29d1822b1c1 /gnu/build | |
| parent | 92fdda5a6351dd5246b65165547d50d0b827cef3 (diff) | |
| parent | 453e7dd8c4b9422a7c80e3b3e75589b6471f5af1 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/linux-boot.scm | 18 | ||||
| -rw-r--r-- | gnu/build/shepherd.scm | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 7d41537652..84726363c0 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -589,15 +589,6 @@ upon error." (load-linux-modules-from-directory linux-modules 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 (let ((status (system* "loadkeys" keymap-file))) (unless (zero? status) @@ -631,6 +622,15 @@ the root file system...\n" root-delay) (unless (pre-mount) (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") ;; Mount the root file system. diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm index f4caefce3c..9d9bfcfbc0 100644 --- a/gnu/build/shepherd.scm +++ b/gnu/build/shepherd.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la> +;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,7 +187,7 @@ namespace, in addition to essential bind-mounts such /proc." (when log-file ;; Create LOG-FILE so we can map it in the container. (unless (file-exists? log-file) - (call-with-output-file log-file (const #t)) + (close (open log-file (logior O_CREAT O_APPEND O_CLOEXEC) #o640)) (when user (let ((pw (getpwnam user))) (chown log-file (passwd:uid pw) (passwd:gid pw)))))) |