summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-05-15 22:34:14 +0200
committerLudovic Courtès <ludo@gnu.org>2020-05-16 00:34:41 +0200
commit12adffd43efe381e9d634d01242ba1988c65ce5c (patch)
treefbd665f9ff71fb7b4b70903702b11868098b2b86 /gnu
parent502f609d0527d07e3289ba38a087d8fc856382fe (diff)
linux-initrd: Silence Guile warnings.
Previously, since the switch to Guile 3, we'd see this warning repeated several times at boot time: WARNING: …: imported module (guix build utils) overrides core binding `delete' * gnu/system/linux-initrd.scm (raw-initrd): In gexp, #:hide 'delete' from (guix build utils). Wrap 'boot-system' in 'parameterize'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system/linux-initrd.scm29
1 files changed, 15 insertions, 14 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index c43d53a210d..0971ec29e21 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> 3;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
4;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> 4;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
5;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> 5;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -197,7 +197,7 @@ upon error."
197 #~(begin 197 #~(begin
198 (use-modules (gnu build linux-boot) 198 (use-modules (gnu build linux-boot)
199 (gnu system file-systems) 199 (gnu system file-systems)
200 (guix build utils) 200 ((guix build utils) #:hide (delete))
201 (guix build bournish) ;add the 'bournish' meta-command 201 (guix build bournish) ;add the 'bournish' meta-command
202 (srfi srfi-26) 202 (srfi srfi-26)
203 203
@@ -213,18 +213,19 @@ upon error."
213 (set-path-environment-variable "PATH" '("bin" "sbin") 213 (set-path-environment-variable "PATH" '("bin" "sbin")
214 '#$helper-packages))) 214 '#$helper-packages)))
215 215
216 (boot-system #:mounts 216 (parameterize ((current-warning-port (%make-void-port "w")))
217 (map spec->file-system 217 (boot-system #:mounts
218 '#$(map file-system->spec file-systems)) 218 (map spec->file-system
219 #:pre-mount (lambda () 219 '#$(map file-system->spec file-systems))
220 (and #$@device-mapping-commands)) 220 #:pre-mount (lambda ()
221 #:linux-modules '#$linux-modules 221 (and #$@device-mapping-commands))
222 #:linux-module-directory '#$kodir 222 #:linux-modules '#$linux-modules
223 #:keymap-file #+(and=> keyboard-layout 223 #:linux-module-directory '#$kodir
224 keyboard-layout->console-keymap) 224 #:keymap-file #+(and=> keyboard-layout
225 #:qemu-guest-networking? #$qemu-networking? 225 keyboard-layout->console-keymap)
226 #:volatile-root? '#$volatile-root? 226 #:qemu-guest-networking? #$qemu-networking?
227 #:on-error '#$on-error))) 227 #:volatile-root? '#$volatile-root?
228 #:on-error '#$on-error))))
228 #:name "raw-initrd")) 229 #:name "raw-initrd"))
229 230
230(define* (file-system-packages file-systems #:key (volatile-root? #f)) 231(define* (file-system-packages file-systems #:key (volatile-root? #f))