me/guix
Archived
1
0
Fork 0
Code Activity

linux-initrd: Silence Guile warnings.

Browse source 
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'.
This commit is contained in:
Ludovic Courtès 2020-05-15 22:34:14 +02:00 • committed by Tobias Geerinckx-Rice
parent ba3138ab0f
commit ba45d9883d
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/system/linux-initrd.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -197,7 +197,7 @@ upon error."
#~(begin #~(begin
(use-modules (gnu build linux-boot) (use-modules (gnu build linux-boot)
(gnu system file-systems) (gnu system file-systems)
(guix build utils) ((guix build utils) #:hide (delete))
(guix build bournish) ;add the 'bournish' meta-command (guix build bournish) ;add the 'bournish' meta-command
(srfi srfi-26) (srfi srfi-26)
@ -213,18 +213,19 @@ upon error."
(set-path-environment-variable "PATH" '("bin" "sbin") (set-path-environment-variable "PATH" '("bin" "sbin")
'#$helper-packages))) '#$helper-packages)))
(boot-system #:mounts (parameterize ((current-warning-port (%make-void-port "w")))
(map spec->file-system (boot-system #:mounts
'#$(map file-system->spec file-systems)) (map spec->file-system
#:pre-mount (lambda () '#$(map file-system->spec file-systems))
(and #$@device-mapping-commands)) #:pre-mount (lambda ()
#:linux-modules '#$linux-modules (and #$@device-mapping-commands))
#:linux-module-directory '#$kodir #:linux-modules '#$linux-modules
#:keymap-file #+(and=> keyboard-layout #:linux-module-directory '#$kodir
keyboard-layout->console-keymap) #:keymap-file #+(and=> keyboard-layout
#:qemu-guest-networking? #$qemu-networking? keyboard-layout->console-keymap)
#:volatile-root? '#$volatile-root? #:qemu-guest-networking? #$qemu-networking?
#:on-error '#$on-error))) #:volatile-root? '#$volatile-root?
#:on-error '#$on-error))))
#:name "raw-initrd")) #:name "raw-initrd"))
(define* (file-system-packages file-systems #:key (volatile-root? #f)) (define* (file-system-packages file-systems #:key (volatile-root? #f))