2017-05-15 16:24:18 -04:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
|
|
|
|
;;; Copyright © 2017 David Craven <david@craven.ch>
|
2022-08-29 16:24:24 -04:00
|
|
|
|
;;; Copyright © 2017, 2020, 2022 Mathieu Othacehe <othacehe@gnu.org>
|
2017-05-15 16:24:18 -04:00
|
|
|
|
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
profiles: Hooks honor the #:system parameter of ‘profile-derivation’.
Fixes <https://issues.guix.gnu.org/65225>.
* guix/profiles.scm (info-dir-file, package-cache-file)
(info-dir-file, ghc-package-cache-file, ca-certificate-bundle)
(emacs-subdirs, gdk-pixbuf-loaders-cache-file, glib-schemas)
(gtk-icon-themes, gtk-im-modules, linux-module-database)
(xdg-desktop-database, xdg-mime-database, fonts-dir-file)
(manual-database, manual-database/optional): Add optional #:system
parameter and pass it to ‘gexp->derivation’.
(profile-derivation): Pass HOOK a second parameter, SYSTEM.
* gnu/bootloader.scm (efi-bootloader-profile)[efi-bootloader-profile-hook]:
Add optional #:system parameter and pass it to ‘gexp->derivation’.
* guix/channels.scm (package-cache-file): Likewise.
* tests/profiles.scm ("profile-derivation, #:system, and hooks"): New
test.
Reported-by: Tobias Geerinckx-Rice <me@tobias.gr>
2023-10-19 10:39:06 -04:00
|
|
|
|
;;; Copyright © 2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
|
2020-05-26 10:54:18 -04:00
|
|
|
|
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
2022-08-21 04:41:15 -04:00
|
|
|
|
;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz>
|
2022-08-28 04:04:46 -04:00
|
|
|
|
;;; Copyright © 2022 Reza Alizadeh Majd <r.majd@pantherx.org>
|
2024-01-11 12:35:40 -05:00
|
|
|
|
;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
|
gnu: bootloader: Add bootloader-target record and infastructure.
* gnu/bootloader.scm (bootloader-target): New record.
(&target-error): New condition.
(pathcat, get-target-of-type, parent-of, unfold-pathcat, target-base?,
type-major?, ensure, ensure-target-types, ensure-majors, gbegin): New
procedures.
(define-literal, with-targets, :path, :devpath, :device, :fs, :label,
:uuid): New macros.
* guix/ui.scm (call-with-error-handling)[target-error?]: Handle
target-errors.
Change-Id: I3f07c9096dd8b91c04449b6360b3b7d21640da14
2024-08-06 20:11:15 -04:00
|
|
|
|
;;; Copyright © 2024 Lilah Tascheter <lilah@lunabee.space>
|
2017-05-15 16:24:18 -04:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (gnu bootloader)
|
gnu: bootloader: Add bootloader-target record and infastructure.
* gnu/bootloader.scm (bootloader-target): New record.
(&target-error): New condition.
(pathcat, get-target-of-type, parent-of, unfold-pathcat, target-base?,
type-major?, ensure, ensure-target-types, ensure-majors, gbegin): New
procedures.
(define-literal, with-targets, :path, :devpath, :device, :fs, :label,
:uuid): New macros.
* guix/ui.scm (call-with-error-handling)[target-error?]: Handle
target-errors.
Change-Id: I3f07c9096dd8b91c04449b6360b3b7d21640da14
2024-08-06 20:11:15 -04:00
|
|
|
|
#:autoload (gnu build file-systems)
|
|
|
|
|
(read-partition-label read-partition-uuid
|
|
|
|
|
find-partition-by-label find-partition-by-uuid)
|
2022-08-21 04:41:15 -04:00
|
|
|
|
#:use-module (gnu system file-systems)
|
|
|
|
|
#:use-module (gnu system uuid)
|
gnu: bootloader: Add bootloader-target record and infastructure.
* gnu/bootloader.scm (bootloader-target): New record.
(&target-error): New condition.
(pathcat, get-target-of-type, parent-of, unfold-pathcat, target-base?,
type-major?, ensure, ensure-target-types, ensure-majors, gbegin): New
procedures.
(define-literal, with-targets, :path, :devpath, :device, :fs, :label,
:uuid): New macros.
* guix/ui.scm (call-with-error-handling)[target-error?]: Handle
target-errors.
Change-Id: I3f07c9096dd8b91c04449b6360b3b7d21640da14
2024-08-06 20:11:15 -04:00
|
|
|
|
#:autoload (guix build syscalls)
|
|
|
|
|
(mounts mount-source mount-point mount-type)
|
2021-08-30 08:22:35 -04:00
|
|
|
|
#:use-module (guix deprecation)
|
|
|
|
|
#:use-module (guix diagnostics)
|
gnu: bootloader: Add bootloader-target record and infastructure.
* gnu/bootloader.scm (bootloader-target): New record.
(&target-error): New condition.
(pathcat, get-target-of-type, parent-of, unfold-pathcat, target-base?,
type-major?, ensure, ensure-target-types, ensure-majors, gbegin): New
procedures.
(define-literal, with-targets, :path, :devpath, :device, :fs, :label,
:uuid): New macros.
* guix/ui.scm (call-with-error-handling)[target-error?]: Handle
target-errors.
Change-Id: I3f07c9096dd8b91c04449b6360b3b7d21640da14
2024-08-06 20:11:15 -04:00
|
|
|
|
#:use-module (guix gexp)
|
2021-08-30 08:22:35 -04:00
|
|
|
|
#:use-module (guix i18n)
|
gnu: bootloader: Add bootloader-target record and infastructure.
* gnu/bootloader.scm (bootloader-target): New record.
(&target-error): New condition.
(pathcat, get-target-of-type, parent-of, unfold-pathcat, target-base?,
type-major?, ensure, ensure-target-types, ensure-majors, gbegin): New
procedures.
(define-literal, with-targets, :path, :devpath, :device, :fs, :label,
:uuid): New macros.
* guix/ui.scm (call-with-error-handling)[target-error?]: Handle
target-errors.
Change-Id: I3f07c9096dd8b91c04449b6360b3b7d21640da14
2024-08-06 20:11:15 -04:00
|
|
|
|
#:use-module (guix modules)
|
|
|
|
|
#:use-module (guix profiles)
|
|
|
|
|
#:use-module (guix records)
|
|
|
|
|
#:use-module (guix utils)
|
|
|
|
|
#:use-module (ice-9 match)
|
|
|
|
|
#:use-module (ice-9 receive)
|
|
|
|
|
#:use-module (rnrs bytevectors)
|
2017-05-15 16:24:18 -04:00
|
|
|
|
#:use-module (srfi srfi-1)
|
gnu: bootloader: Add bootloader-target record and infastructure.
* gnu/bootloader.scm (bootloader-target): New record.
(&target-error): New condition.
(pathcat, get-target-of-type, parent-of, unfold-pathcat, target-base?,
type-major?, ensure, ensure-target-types, ensure-majors, gbegin): New
procedures.
(define-literal, with-targets, :path, :devpath, :device, :fs, :label,
:uuid): New macros.
* guix/ui.scm (call-with-error-handling)[target-error?]: Handle
target-errors.
Change-Id: I3f07c9096dd8b91c04449b6360b3b7d21640da14
2024-08-06 20:11:15 -04:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2022-09-04 13:25:42 -04:00
|
|
|
|
#:use-module (srfi srfi-34)
|
|
|
|
|
#:use-module (srfi srfi-35)
|
2017-05-29 08:24:20 -04:00
|
|
|
|
#:export (menu-entry
|
|
|
|
|
menu-entry?
|
|
|
|
|
menu-entry-label
|
|
|
|
|
menu-entry-device
|
2024-08-06 20:11:17 -04:00
|
|
|
|
menu-entry-device-mount-point
|
|
|
|
|
menu-entry-device-subvol
|
2017-05-29 08:24:20 -04:00
|
|
|
|
menu-entry-linux
|
|
|
|
|
menu-entry-linux-arguments
|
|
|
|
|
menu-entry-initrd
|
2020-05-26 10:54:18 -04:00
|
|
|
|
menu-entry-multiboot-kernel
|
|
|
|
|
menu-entry-multiboot-arguments
|
|
|
|
|
menu-entry-multiboot-modules
|
2022-09-04 13:25:38 -04:00
|
|
|
|
menu-entry-chain-loader
|
2017-05-29 08:24:20 -04:00
|
|
|
|
|
2024-08-06 20:11:17 -04:00
|
|
|
|
normalize-file
|
2019-08-28 17:27:20 -04:00
|
|
|
|
menu-entry->sexp
|
|
|
|
|
sexp->menu-entry
|
|
|
|
|
|
2017-05-29 08:24:20 -04:00
|
|
|
|
bootloader
|
2017-05-15 16:24:18 -04:00
|
|
|
|
bootloader?
|
|
|
|
|
bootloader-name
|
|
|
|
|
bootloader-package
|
2024-08-06 20:11:17 -04:00
|
|
|
|
bootloader-default-targets
|
2017-05-15 16:24:18 -04:00
|
|
|
|
bootloader-installer
|
2020-05-23 13:09:14 -04:00
|
|
|
|
bootloader-disk-image-installer
|
2017-05-15 16:24:18 -04:00
|
|
|
|
bootloader-configuration-file
|
|
|
|
|
bootloader-configuration-file-generator
|
|
|
|
|
|
gnu: bootloader: Add bootloader-target record and infastructure.
* gnu/bootloader.scm (bootloader-target): New record.
(&target-error): New condition.
(pathcat, get-target-of-type, parent-of, unfold-pathcat, target-base?,
type-major?, ensure, ensure-target-types, ensure-majors, gbegin): New
procedures.
(define-literal, with-targets, :path, :devpath, :device, :fs, :label,
:uuid): New macros.
* guix/ui.scm (call-with-error-handling)[target-error?]: Handle
target-errors.
Change-Id: I3f07c9096dd8b91c04449b6360b3b7d21640da14
2024-08-06 20:11:15 -04:00
|
|
|
|
bootloader-target
|
|
|
|
|
bootloader-target?
|
|
|
|
|
bootloader-target-type
|
|
|
|
|
bootloader-target-expected?
|
|
|
|
|
bootloader-target-path
|
|
|
|
|
bootloader-target-offset
|
|
|
|
|
bootloader-target-device
|
|
|
|
|
bootloader-target-file-system
|
|
|
|
|
bootloader-target-label
|
|
|
|
|
bootloader-target-uuid
|
|
|
|
|
|
|
|
|
|
target-error?
|
|
|
|
|
target-error-type
|
|
|
|
|
target-error-targets
|
|
|
|
|
|
|
|
|
|
gbegin
|
|
|
|
|
:path :devpath :device :fs :label :uuid
|
|
|
|
|
with-targets
|
|
|
|
|
|
2017-05-15 16:24:18 -04:00
|
|
|
|
bootloader-configuration
|
|
|
|
|
bootloader-configuration?
|
|
|
|
|
bootloader-configuration-bootloader
|
2021-08-06 16:33:02 -04:00
|
|
|
|
bootloader-configuration-targets
|
2017-05-15 16:24:18 -04:00
|
|
|
|
bootloader-configuration-menu-entries
|
|
|
|
|
bootloader-configuration-default-entry
|
2024-08-06 20:11:17 -04:00
|
|
|
|
bootloader-configuration-efi-removable?
|
|
|
|
|
bootloader-configuration-32bit?
|
2017-05-15 16:24:18 -04:00
|
|
|
|
bootloader-configuration-timeout
|
2019-03-17 17:37:53 -04:00
|
|
|
|
bootloader-configuration-keyboard-layout
|
2017-05-15 16:24:18 -04:00
|
|
|
|
bootloader-configuration-theme
|
|
|
|
|
bootloader-configuration-terminal-outputs
|
|
|
|
|
bootloader-configuration-terminal-inputs
|
|
|
|
|
bootloader-configuration-serial-unit
|
|
|
|
|
bootloader-configuration-serial-speed
|
2022-08-28 04:04:46 -04:00
|
|
|
|
bootloader-configuration-device-tree-support?
|
2024-01-11 12:35:40 -05:00
|
|
|
|
bootloader-configuration-extra-initrd
|
2017-05-15 16:24:18 -04:00
|
|
|
|
|
2024-08-06 20:11:17 -04:00
|
|
|
|
bootloader-configuration->gexp
|
|
|
|
|
bootloader-configurations->gexp
|
2020-10-25 12:59:19 -04:00
|
|
|
|
|
2024-08-06 20:11:17 -04:00
|
|
|
|
%efi-supported-systems
|
|
|
|
|
efi-arch
|
|
|
|
|
install-efi
|
2020-10-25 12:59:19 -04:00
|
|
|
|
efi-bootloader-chain))
|
2017-05-15 16:24:18 -04:00
|
|
|
|
|
2017-05-29 08:24:20 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Menu-entry record.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <menu-entry>
|
|
|
|
|
menu-entry make-menu-entry
|
|
|
|
|
menu-entry?
|
|
|
|
|
(label menu-entry-label)
|
|
|
|
|
(device menu-entry-device ; file system uuid, label, or #f
|
|
|
|
|
(default #f))
|
2017-06-29 06:42:59 -04:00
|
|
|
|
(device-mount-point menu-entry-device-mount-point
|
|
|
|
|
(default #f))
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(device-subvol menu-entry-device-subvol
|
|
|
|
|
(default #f))
|
2020-05-26 10:54:18 -04:00
|
|
|
|
(linux menu-entry-linux
|
|
|
|
|
(default #f))
|
2017-05-29 08:24:20 -04:00
|
|
|
|
(linux-arguments menu-entry-linux-arguments
|
|
|
|
|
(default '())) ; list of string-valued gexps
|
2020-05-26 10:54:18 -04:00
|
|
|
|
(initrd menu-entry-initrd ; file name of the initrd as a gexp
|
|
|
|
|
(default #f))
|
|
|
|
|
(multiboot-kernel menu-entry-multiboot-kernel
|
|
|
|
|
(default #f))
|
|
|
|
|
(multiboot-arguments menu-entry-multiboot-arguments
|
|
|
|
|
(default '())) ; list of string-valued gexps
|
|
|
|
|
(multiboot-modules menu-entry-multiboot-modules
|
2022-09-04 13:25:38 -04:00
|
|
|
|
(default '())) ; list of multiboot commands, where
|
2020-05-26 10:54:18 -04:00
|
|
|
|
; a command is a list of <string>
|
2022-09-04 13:25:38 -04:00
|
|
|
|
(chain-loader menu-entry-chain-loader
|
|
|
|
|
(default #f))) ; string, path of efi file
|
2017-05-29 08:24:20 -04:00
|
|
|
|
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(define (normalize-file entry file)
|
|
|
|
|
"Normalize a file FILE stored in a menu entry into one suitable for a
|
|
|
|
|
bootloader. Realizes device-mount-point and device-subvol."
|
|
|
|
|
(match-menu-entry entry (device-mount-point device-subvol)
|
|
|
|
|
;; Avoid using cut procedure from SRFI-26 inside G-exp.
|
|
|
|
|
(let ((mount (and=> device-mount-point (cut string-trim <> #\/))))
|
|
|
|
|
#~(let* ((file (string-trim #$file #\/))
|
|
|
|
|
(file (if (and #$mount (string-prefix? #$mount file))
|
|
|
|
|
(substring file (string-length #$mount))
|
|
|
|
|
file)))
|
|
|
|
|
(string-append (or #$device-subvol "") "/" file)))))
|
|
|
|
|
|
2022-09-04 13:25:42 -04:00
|
|
|
|
(define (report-menu-entry-error menu-entry)
|
|
|
|
|
(raise
|
|
|
|
|
(condition
|
|
|
|
|
(&message
|
|
|
|
|
(message
|
|
|
|
|
(format #f (G_ "invalid menu-entry: ~a") menu-entry)))
|
|
|
|
|
(&fix-hint
|
|
|
|
|
(hint
|
|
|
|
|
(G_ "Please chose only one of:
|
|
|
|
|
@enumerate
|
|
|
|
|
@item direct boot by specifying fields @code{linux},
|
|
|
|
|
@code{linux-arguments} and @code{linux-modules},
|
|
|
|
|
@item multiboot by specifying fields @code{multiboot-kernel},
|
|
|
|
|
@code{multiboot-arguments} and @code{multiboot-modules},
|
|
|
|
|
@item chain-loader by specifying field @code{chain-loader}.
|
|
|
|
|
@end enumerate"))))))
|
|
|
|
|
|
2019-08-28 17:27:20 -04:00
|
|
|
|
(define (menu-entry->sexp entry)
|
|
|
|
|
"Return ENTRY serialized as an sexp."
|
2022-08-21 04:41:15 -04:00
|
|
|
|
(define (device->sexp device)
|
|
|
|
|
(match device
|
|
|
|
|
((? uuid? uuid)
|
|
|
|
|
`(uuid ,(uuid-type uuid) ,(uuid->string uuid)))
|
|
|
|
|
((? file-system-label? label)
|
|
|
|
|
`(label ,(file-system-label->string label)))
|
|
|
|
|
(_ device)))
|
2019-08-28 17:27:20 -04:00
|
|
|
|
(match entry
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(($ <menu-entry> label device mount-point subvol
|
2022-09-04 13:25:38 -04:00
|
|
|
|
(? identity linux) linux-arguments (? identity initrd)
|
|
|
|
|
#f () () #f)
|
2019-08-28 17:27:20 -04:00
|
|
|
|
`(menu-entry (version 0)
|
|
|
|
|
(label ,label)
|
2022-08-21 04:41:15 -04:00
|
|
|
|
(device ,(device->sexp device))
|
2019-08-28 17:27:20 -04:00
|
|
|
|
(device-mount-point ,mount-point)
|
|
|
|
|
(linux ,linux)
|
|
|
|
|
(linux-arguments ,linux-arguments)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(initrd ,initrd)
|
|
|
|
|
(device-subvol ,subvol)))
|
|
|
|
|
(($ <menu-entry> label device mount-point subvol #f () #f
|
2022-09-04 13:25:38 -04:00
|
|
|
|
(? identity multiboot-kernel) multiboot-arguments
|
|
|
|
|
multiboot-modules #f)
|
2020-05-26 10:54:18 -04:00
|
|
|
|
`(menu-entry (version 0)
|
|
|
|
|
(label ,label)
|
2022-08-21 04:41:15 -04:00
|
|
|
|
(device ,(device->sexp device))
|
2020-05-26 10:54:18 -04:00
|
|
|
|
(device-mount-point ,mount-point)
|
|
|
|
|
(multiboot-kernel ,multiboot-kernel)
|
|
|
|
|
(multiboot-arguments ,multiboot-arguments)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(multiboot-modules ,multiboot-modules)
|
|
|
|
|
(device-subvol ,subvol)))
|
|
|
|
|
(($ <menu-entry> label device mount-point subvol #f () #f #f () ()
|
2022-09-04 13:25:38 -04:00
|
|
|
|
(? identity chain-loader))
|
|
|
|
|
`(menu-entry (version 0)
|
|
|
|
|
(label ,label)
|
|
|
|
|
(device ,(device->sexp device))
|
|
|
|
|
(device-mount-point ,mount-point)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(chain-loader ,chain-loader)
|
|
|
|
|
(device-subvol ,subvol)))
|
2022-09-04 13:25:42 -04:00
|
|
|
|
(_ (report-menu-entry-error entry))))
|
2019-08-28 17:27:20 -04:00
|
|
|
|
|
|
|
|
|
(define (sexp->menu-entry sexp)
|
|
|
|
|
"Turn SEXP, an sexp as returned by 'menu-entry->sexp', into a <menu-entry>
|
|
|
|
|
record."
|
2024-08-06 20:11:17 -04:00
|
|
|
|
;; XXX: The match ORs shadow subvol.
|
|
|
|
|
(define subvol #f)
|
2022-08-21 04:41:15 -04:00
|
|
|
|
(define (sexp->device device-sexp)
|
|
|
|
|
(match device-sexp
|
|
|
|
|
(('uuid type uuid-string)
|
|
|
|
|
(uuid uuid-string type))
|
|
|
|
|
(('label label)
|
|
|
|
|
(file-system-label label))
|
|
|
|
|
(_ device-sexp)))
|
2019-08-28 17:27:20 -04:00
|
|
|
|
(match sexp
|
|
|
|
|
(('menu-entry ('version 0)
|
|
|
|
|
('label label) ('device device)
|
|
|
|
|
('device-mount-point mount-point)
|
|
|
|
|
('linux linux) ('linux-arguments linux-arguments)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
('initrd initrd)
|
|
|
|
|
(or ('device-subvol subvol _ ...) (_ ...)))
|
2019-08-28 17:27:20 -04:00
|
|
|
|
(menu-entry
|
|
|
|
|
(label label)
|
2022-08-21 04:41:15 -04:00
|
|
|
|
(device (sexp->device device))
|
2019-08-28 17:27:20 -04:00
|
|
|
|
(device-mount-point mount-point)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(device-subvol subvol)
|
2019-08-28 17:27:20 -04:00
|
|
|
|
(linux linux)
|
|
|
|
|
(linux-arguments linux-arguments)
|
2020-05-26 10:54:18 -04:00
|
|
|
|
(initrd initrd)))
|
|
|
|
|
(('menu-entry ('version 0)
|
|
|
|
|
('label label) ('device device)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
('device-mount-point mount-point) ('device-subvol subvol)
|
2020-05-26 10:54:18 -04:00
|
|
|
|
('multiboot-kernel multiboot-kernel)
|
|
|
|
|
('multiboot-arguments multiboot-arguments)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
('multiboot-modules multiboot-modules)
|
|
|
|
|
(or ('device-subvol subvol _ ...) (_ ...)))
|
2020-05-26 10:54:18 -04:00
|
|
|
|
(menu-entry
|
|
|
|
|
(label label)
|
2022-08-21 04:41:15 -04:00
|
|
|
|
(device (sexp->device device))
|
2020-05-26 10:54:18 -04:00
|
|
|
|
(device-mount-point mount-point)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(device-subvol subvol)
|
2020-05-26 10:54:18 -04:00
|
|
|
|
(multiboot-kernel multiboot-kernel)
|
|
|
|
|
(multiboot-arguments multiboot-arguments)
|
2022-09-04 13:25:38 -04:00
|
|
|
|
(multiboot-modules multiboot-modules)))
|
|
|
|
|
(('menu-entry ('version 0)
|
|
|
|
|
('label label) ('device device)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
('device-mount-point mount-point) ('device-subvol subvol)
|
|
|
|
|
('chain-loader chain-loader)
|
|
|
|
|
(or ('device-subvol subvol _ ...) (_ ...)))
|
2022-09-04 13:25:38 -04:00
|
|
|
|
(menu-entry
|
|
|
|
|
(label label)
|
|
|
|
|
(device (sexp->device device))
|
|
|
|
|
(device-mount-point mount-point)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(device-subvol subvol)
|
2022-09-04 13:25:38 -04:00
|
|
|
|
(chain-loader chain-loader)))))
|
2019-08-28 17:27:20 -04:00
|
|
|
|
|
2017-05-15 16:24:18 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Bootloader record.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
;; The <bootloader> record contains fields expressing how the bootloader
|
|
|
|
|
;; should be installed. Every bootloader in gnu/bootloader/ directory
|
|
|
|
|
;; has to be described by this record.
|
|
|
|
|
|
|
|
|
|
(define-record-type* <bootloader>
|
|
|
|
|
bootloader make-bootloader
|
|
|
|
|
bootloader?
|
|
|
|
|
(name bootloader-name)
|
|
|
|
|
(package bootloader-package)
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(default-targets bootloader-default-targets (default '()))
|
2017-05-15 16:24:18 -04:00
|
|
|
|
(installer bootloader-installer)
|
2020-05-23 13:09:14 -04:00
|
|
|
|
(disk-image-installer bootloader-disk-image-installer
|
|
|
|
|
(default #f))
|
2017-05-15 16:24:18 -04:00
|
|
|
|
(configuration-file bootloader-configuration-file)
|
|
|
|
|
(configuration-file-generator bootloader-configuration-file-generator))
|
|
|
|
|
|
gnu: bootloader: Add bootloader-target record and infastructure.
* gnu/bootloader.scm (bootloader-target): New record.
(&target-error): New condition.
(pathcat, get-target-of-type, parent-of, unfold-pathcat, target-base?,
type-major?, ensure, ensure-target-types, ensure-majors, gbegin): New
procedures.
(define-literal, with-targets, :path, :devpath, :device, :fs, :label,
:uuid): New macros.
* guix/ui.scm (call-with-error-handling)[target-error?]: Handle
target-errors.
Change-Id: I3f07c9096dd8b91c04449b6360b3b7d21640da14
2024-08-06 20:11:15 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Bootloader target record.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
;; <bootloader-target> represents different kinds of targets in a
|
|
|
|
|
;; normalized form.
|
|
|
|
|
|
|
|
|
|
(define-record-type* <bootloader-target>
|
|
|
|
|
bootloader-target make-bootloader-target bootloader-target?
|
|
|
|
|
(type bootloader-target-type) ; symbol
|
|
|
|
|
(expected? bootloader-target-expected? (default #f)) ; bool
|
|
|
|
|
|
|
|
|
|
(path bootloader-target-path (default #f)) ; string|#f
|
|
|
|
|
(offset bootloader-target-offset (thunked) ; symbol|#f
|
|
|
|
|
(default (and (bootloader-target-path this-record)
|
|
|
|
|
(not (eq? (bootloader-target-type this-record) 'root))
|
|
|
|
|
'root)))
|
|
|
|
|
(device bootloader-target-device (default #f)) ; string|#f
|
|
|
|
|
(file-system bootloader-target-file-system (default #f)) ; string|#f
|
|
|
|
|
(label bootloader-target-label (default #f)) ; string|#f
|
|
|
|
|
(uuid bootloader-target-uuid (default #f))) ; uuid|#f
|
|
|
|
|
|
|
|
|
|
(define-condition-type &target-error &error target-error?
|
|
|
|
|
(type target-error-type)
|
|
|
|
|
(targets target-error-targets))
|
|
|
|
|
|
|
|
|
|
(define (pathcat p1 p2)
|
|
|
|
|
(string-append (string-trim-right p1 #\/) "/" (string-trim p2 #\/)))
|
|
|
|
|
|
|
|
|
|
(define* (get-target-of-type type targets #:optional require?)
|
|
|
|
|
"Finds a target in TARGETS of type TYPE, returns REQUIRE? if #false,
|
|
|
|
|
or provides an error otherwise."
|
|
|
|
|
(define (type? target)
|
|
|
|
|
(eq? type (bootloader-target-type target)))
|
|
|
|
|
(match (filter type? targets)
|
|
|
|
|
((target _ ...) target)
|
|
|
|
|
(_ (and require?
|
|
|
|
|
(raise
|
|
|
|
|
(condition
|
|
|
|
|
(&message (message (G_ "required, but not provided")))
|
|
|
|
|
(&target-error (type type) (targets targets))))))))
|
|
|
|
|
|
|
|
|
|
(define (parent-of target targets)
|
|
|
|
|
"Resolve the parent of TARGET in TARGETS, return #f if orphan."
|
|
|
|
|
(and=> (bootloader-target-offset target)
|
|
|
|
|
(cut get-target-of-type <> targets #t)))
|
|
|
|
|
|
|
|
|
|
(define (unfold-pathcat target targets)
|
|
|
|
|
"Find the full VFS path of TARGET."
|
|
|
|
|
(let ((quit (lambda (t) (not (and=> t bootloader-target-path))))
|
|
|
|
|
(parent-of (cut parent-of <> targets)))
|
|
|
|
|
(reduce pathcat #f
|
|
|
|
|
(unfold quit bootloader-target-path parent-of target))))
|
|
|
|
|
|
|
|
|
|
(define (target-base? t)
|
|
|
|
|
(or (not t) (match-record t <bootloader-target>
|
|
|
|
|
(expected? offset device label uuid)
|
|
|
|
|
(or device label uuid (not offset) expected?))))
|
|
|
|
|
|
|
|
|
|
(define (type-major? target) (memq target '(root esp disk)))
|
|
|
|
|
|
|
|
|
|
(define (ensure types targets end)
|
|
|
|
|
(let* ((used-in (cute unfold end identity (cut parent-of <> targets) <>))
|
|
|
|
|
(cons-in (lambda (t) (cons t (used-in t))))
|
|
|
|
|
(ensure (map (cut get-target-of-type <> targets #t) types)))
|
|
|
|
|
(filter identity (apply append (map cons-in ensure)))))
|
|
|
|
|
|
|
|
|
|
(define* (ensure-target-types types targets #:optional (base? #f))
|
|
|
|
|
"Ensures all TYPES are provided in TARGETS. Returns #t iff every ensured
|
|
|
|
|
target and its requirements are fully provided. Errors out when a required TYPE
|
|
|
|
|
isn't provided. When BASE?, only ensure path requirements up to a device."
|
|
|
|
|
(not (any bootloader-target-expected?
|
|
|
|
|
(ensure types targets (if base? target-base? not)))))
|
|
|
|
|
|
|
|
|
|
(define (ensure-majors types targets)
|
|
|
|
|
"Errors out when a required TYPE isn't provided, or when use of multiple major
|
|
|
|
|
targets is detected."
|
|
|
|
|
(let* ((all (map bootloader-target-type (ensure types targets target-base?)))
|
|
|
|
|
(majors (delete-duplicates (filter type-major? all) eq?)))
|
|
|
|
|
(if (< (length majors) 2) #t
|
|
|
|
|
(raise (condition (&message (message (G_ "multiple major targets used")))
|
|
|
|
|
(&target-error (type majors) (targets targets)))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(define (gbegin . gex)
|
|
|
|
|
"Sequence provided g-expressions."
|
|
|
|
|
(case (length gex) ((0) #f) ((1) (car gex)) (else #~(begin #$@gex))))
|
|
|
|
|
|
|
|
|
|
;; syntax matching on free literals breaks easily, so bind them
|
|
|
|
|
(define-syntax-rule (define-literal id) (define-syntax id (syntax-rules ())))
|
|
|
|
|
(define-literal :path)
|
|
|
|
|
(define-literal :devpath)
|
|
|
|
|
(define-literal :device)
|
|
|
|
|
(define-literal :fs)
|
|
|
|
|
(define-literal :label)
|
|
|
|
|
(define-literal :uuid)
|
|
|
|
|
|
|
|
|
|
(define-syntax with-targets
|
|
|
|
|
(cut syntax-case <> ()
|
|
|
|
|
((_ targets-expr block ...)
|
|
|
|
|
(let* ((genvars (compose generate-temporaries make-list))
|
|
|
|
|
(targets (car (genvars 1))))
|
|
|
|
|
(define (resolve in target base)
|
|
|
|
|
(with-syntax ((target target) (base base) (targets targets))
|
|
|
|
|
(syntax-case in
|
|
|
|
|
(:path :devpath :device :fs :label :uuid)
|
|
|
|
|
((name _) (not (identifier? #'name))
|
|
|
|
|
#`(_ (syntax-error "binds must be to identifiers" #,in)))
|
|
|
|
|
((name :device) #'(name (bootloader-target-device base)))
|
|
|
|
|
((name :label) #'(name (bootloader-target-label base)))
|
|
|
|
|
((name :uuid) #'(name (bootloader-target-uuid base)))
|
|
|
|
|
((name :fs) #'(name (bootloader-target-file-system base)))
|
|
|
|
|
((name :path) #'(name (unfold-pathcat target targets)))
|
|
|
|
|
((name :devpath)
|
|
|
|
|
#'(name (if (target-base? target)
|
|
|
|
|
"/"
|
|
|
|
|
(pathcat "/" (bootloader-target-path target)))))
|
|
|
|
|
(_ #`(_ (syntax-error "invalid binding spec" #,in))))))
|
|
|
|
|
|
|
|
|
|
(define (binds spec)
|
|
|
|
|
(syntax-case spec (=>)
|
|
|
|
|
((type => binds ...)
|
|
|
|
|
(with-syntax (((target base) (genvars 2)) (targets targets))
|
|
|
|
|
(append
|
|
|
|
|
#`((get (lambda (t) (get-target-of-type t targets #t)))
|
|
|
|
|
(target (get type))
|
|
|
|
|
(base (if (target-base? target)
|
|
|
|
|
target
|
|
|
|
|
(get (bootloader-target-offset target)))))
|
|
|
|
|
(map (cut resolve <> #'target #'base) #'(binds ...)))))
|
|
|
|
|
(_ #f)))
|
|
|
|
|
|
|
|
|
|
(define blocks
|
|
|
|
|
(cut syntax-case <> ()
|
|
|
|
|
((spec ... expr)
|
|
|
|
|
(let* ((path? (cut syntax-case <> (:path) ((_ :path) #t) (_ #f)))
|
|
|
|
|
(qualified? (cut syntax-case <> (=>)
|
|
|
|
|
((_ => spec ...) (any path? #'(spec ...)))
|
|
|
|
|
(_ #f)))
|
|
|
|
|
(specs #'(spec ...))
|
|
|
|
|
(lets (apply append (filter-map binds specs)))
|
|
|
|
|
(type (cut syntax-case <> (=>)
|
|
|
|
|
((t => _ ...) #'t) (t #'t))))
|
|
|
|
|
(receive (full part) (partition qualified? specs)
|
|
|
|
|
#`(and (ensure-majors (list #,@(map type specs)) #,targets)
|
|
|
|
|
(ensure-target-types (list #,@(map type part))
|
|
|
|
|
#,targets #t)
|
|
|
|
|
(ensure-target-types (list #,@(map type full))
|
|
|
|
|
#,targets #f)
|
|
|
|
|
(let* #,lets expr)))))
|
|
|
|
|
(bad #'(syntax-error "malformed block" bad))))
|
|
|
|
|
"Using the list TARGETS, evaluate and sequence each BLOCK to produce a
|
|
|
|
|
gexp. BLOCK is a set of SPECs followed by an EXPR (evaluating to a gexp).
|
|
|
|
|
Each SPEC denotes a type of target to guard EXPR on their existance and
|
|
|
|
|
full-qualification. This procedure is linear in regard to BLOCKs.
|
|
|
|
|
|
|
|
|
|
SPEC may be of the following forms:
|
|
|
|
|
@itemize
|
|
|
|
|
@item 'TYPE Requires TYPE to be fully present or promised. Errors otherwise.
|
|
|
|
|
@item ('TYPE => (VAR COMPONENT) ...): As type, but also binds variables. TYPE's
|
|
|
|
|
COMPONENT is bound to the variable VAR as described below.
|
|
|
|
|
@end itemize
|
|
|
|
|
|
|
|
|
|
Available COMPONENTs are:
|
|
|
|
|
@itemize
|
|
|
|
|
@item :path (fully-qualified)
|
|
|
|
|
@item :devpath (relative from device)
|
|
|
|
|
@item :device (auto-detected from uuid and label if not user-provided)
|
|
|
|
|
@item :fs
|
|
|
|
|
@item :label
|
|
|
|
|
@item :uuid
|
|
|
|
|
@end itemize
|
|
|
|
|
|
|
|
|
|
Note that installers may be called multiple times with different targets being
|
|
|
|
|
fully-qualified. To ensure that targets aren't installed multiple times, make sure
|
|
|
|
|
that each BLOCK ensures at least one major target, either directly or indirectly.
|
|
|
|
|
Likewise, at most one major target should be ensured per BLOCK, under the same
|
|
|
|
|
conditions. Major targets originate from disk image handling, and are currently:
|
|
|
|
|
@itemize
|
|
|
|
|
@item disk
|
|
|
|
|
@item root
|
|
|
|
|
@item esp
|
|
|
|
|
@end itemize"
|
|
|
|
|
#`(let ((#,targets targets-expr))
|
|
|
|
|
(apply gbegin (filter identity
|
|
|
|
|
(list #,@(map blocks #'(block ...))))))))
|
|
|
|
|
(bad #'(syntax-error "must provide targets" bad))))
|
|
|
|
|
|
2017-05-15 16:24:18 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Bootloader configuration record.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
;; The <bootloader-configuration> record contains bootloader independant
|
|
|
|
|
;; configuration used to fill bootloader configuration file.
|
|
|
|
|
|
2021-08-30 08:22:35 -04:00
|
|
|
|
|
2017-05-15 16:24:18 -04:00
|
|
|
|
(define-record-type* <bootloader-configuration>
|
|
|
|
|
bootloader-configuration make-bootloader-configuration
|
|
|
|
|
bootloader-configuration?
|
2022-08-29 16:24:24 -04:00
|
|
|
|
(bootloader
|
2024-08-06 20:11:17 -04:00
|
|
|
|
bootloader-configuration-bootloader) ;<bootloader>
|
2022-08-29 16:24:24 -04:00
|
|
|
|
(targets %bootloader-configuration-targets
|
|
|
|
|
(default #f)) ;list of strings
|
|
|
|
|
(menu-entries bootloader-configuration-menu-entries
|
|
|
|
|
(default '())) ;list of <menu-entry>
|
|
|
|
|
(default-entry bootloader-configuration-default-entry
|
|
|
|
|
(default 0)) ;integer
|
2024-08-06 20:11:17 -04:00
|
|
|
|
(efi-removable? bootloader-configuration-efi-removable?
|
|
|
|
|
(default #f)) ;bool
|
|
|
|
|
(32bit? bootloader-configuration-32bit?
|
|
|
|
|
(default #f)) ;bool
|
2022-08-29 16:24:24 -04:00
|
|
|
|
(timeout bootloader-configuration-timeout
|
|
|
|
|
(default 5)) ;seconds as integer
|
|
|
|
|
(keyboard-layout bootloader-configuration-keyboard-layout
|
|
|
|
|
(default #f)) ;<keyboard-layout> | #f
|
|
|
|
|
(theme bootloader-configuration-theme
|
|
|
|
|
(default #f)) ;bootloader-specific theme
|
|
|
|
|
(terminal-outputs bootloader-configuration-terminal-outputs
|
|
|
|
|
(default '(gfxterm))) ;list of symbols
|
|
|
|
|
(terminal-inputs bootloader-configuration-terminal-inputs
|
|
|
|
|
(default '())) ;list of symbols
|
|
|
|
|
(serial-unit bootloader-configuration-serial-unit
|
|
|
|
|
(default #f)) ;integer | #f
|
|
|
|
|
(serial-speed bootloader-configuration-serial-speed
|
|
|
|
|
(default #f)) ;integer | #f
|
|
|
|
|
(device-tree-support? bootloader-configuration-device-tree-support?
|
2024-01-11 12:35:40 -05:00
|
|
|
|
(default #t)) ;boolean
|
|
|
|
|
(extra-initrd bootloader-configuration-extra-initrd
|
|
|
|
|
(default #f))) ;string | #f
|
2017-05-15 16:24:18 -04:00
|
|
|
|
|
2021-08-06 16:33:02 -04:00
|
|
|
|
|
|
|
|
|
(define (bootloader-configuration-targets config)
|
|
|
|
|
(or (%bootloader-configuration-targets config)
|
|
|
|
|
;; XXX: At least the GRUB installer (see (gnu bootloader grub)) has this
|
|
|
|
|
;; peculiar behavior of installing fonts and GRUB modules when DEVICE is #f,
|
|
|
|
|
;; hence the default value of '(#f) rather than '().
|
|
|
|
|
(list #f)))
|
|
|
|
|
|
2024-08-06 20:11:17 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Bootloader installation paths.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (target-overrides . layers)
|
|
|
|
|
(let* ((types (flat-map (cute map bootloader-target-type <>) layers))
|
|
|
|
|
;; TODO: use loop instead of fold for early termination.
|
|
|
|
|
(pred (lambda (type layer found)
|
|
|
|
|
(or found (get-target-of-type type layer))))
|
|
|
|
|
(find (lambda (type) (fold (cute pred type <> <>) #f layers))))
|
|
|
|
|
(filter identity (map find (delete-duplicates types)))))
|
|
|
|
|
|
|
|
|
|
(define (normalize targets)
|
|
|
|
|
"Augments TARGETS with filesystem information at runtime, allowing
|
|
|
|
|
users to specify a lot less information. Puts TARGETS into a normal
|
|
|
|
|
form, where each path is fully specified up to a device offset."
|
|
|
|
|
(define (mass m)
|
|
|
|
|
`((,(mount-source m) . ,m)
|
|
|
|
|
(,(mount-point m) . ,m)))
|
|
|
|
|
|
|
|
|
|
(define (accessible=> d f)
|
|
|
|
|
(and d (access? d R_OK) (f d)))
|
|
|
|
|
|
|
|
|
|
(define (fixuuid target)
|
|
|
|
|
(match-record target <bootloader-target> (uuid file-system)
|
|
|
|
|
(let ((type (cond ((not file-system) 'dce)
|
|
|
|
|
((member file-system '("vfat" "fat32")) 'fat)
|
|
|
|
|
((string=? file-system "ntfs") 'ntfs)
|
|
|
|
|
((string=? file-system "iso9660") 'iso9660)
|
|
|
|
|
(else 'dce))))
|
|
|
|
|
(bootloader-target (inherit target)
|
|
|
|
|
(uuid (cond ((uuid? uuid) uuid)
|
|
|
|
|
((bytevector? uuid) (bytevector->uuid uuid type))
|
|
|
|
|
((string? uuid) (string->uuid uuid type))
|
|
|
|
|
(else #f)))))))
|
|
|
|
|
|
|
|
|
|
(define (arborify target targets)
|
|
|
|
|
(let* ((up (lambda (t) (and t (parent-of t targets))))
|
|
|
|
|
(proto (unfold target-base? identity up (up target) list))
|
|
|
|
|
(chain (reverse (cons target proto))))
|
|
|
|
|
(bootloader-target
|
|
|
|
|
(inherit target)
|
|
|
|
|
(offset (and=> (car chain) bootloader-target-type))
|
|
|
|
|
(path (reduce pathcat #f (map bootloader-target-path (cdr chain)))))))
|
|
|
|
|
|
|
|
|
|
(let ((amounts (delay (apply append (map mass (mounts))))))
|
|
|
|
|
(define (assoc-mnt f)
|
|
|
|
|
(lambda (v) (and=> (assoc-ref (force amounts) v) f)))
|
|
|
|
|
|
|
|
|
|
(define (scrape target)
|
|
|
|
|
(match-record target <bootloader-target>
|
|
|
|
|
(expected? path offset device label uuid file-system)
|
|
|
|
|
(if expected? target
|
|
|
|
|
(bootloader-target
|
|
|
|
|
(inherit target)
|
|
|
|
|
(device (or device
|
|
|
|
|
(false-if-exception
|
|
|
|
|
(or (and=> uuid find-partition-by-uuid)
|
|
|
|
|
(and=> label find-partition-by-label)))
|
|
|
|
|
(and path ((assoc-mnt mount-source)
|
|
|
|
|
(unfold-pathcat target targets)))))
|
|
|
|
|
(label (or label (accessible=> device read-partition-label)))
|
|
|
|
|
(uuid (or uuid (accessible=> device read-partition-uuid)))
|
|
|
|
|
(file-system (or file-system (and=> device (assoc-mnt mount-type))))
|
|
|
|
|
(offset (and path offset))
|
|
|
|
|
(path (or path (and=> device (assoc-mnt mount-point))))))))
|
|
|
|
|
|
|
|
|
|
(let ((mid (map (compose fixuuid scrape) targets)))
|
|
|
|
|
(map (cut arborify <> mid) mid))))
|
|
|
|
|
|
|
|
|
|
(define* (bootloader-configuration->gexp bootloader-config args #:key
|
|
|
|
|
(root-offset "/") (overrides '()))
|
|
|
|
|
"Returns a gexp to install BOOTLOADER-CONFIG to its targets, passing ARGS
|
|
|
|
|
to each installer alongside the additional #:bootloader-config keyword
|
|
|
|
|
arguments. Target OVERRIDES are applied and all path targets have ROOT-OFFSET
|
|
|
|
|
applied. The following keyword arguments are expected in ARGS:
|
|
|
|
|
@enumerate
|
|
|
|
|
@item current-boot-alternative
|
|
|
|
|
@item old-boot-alternatives
|
|
|
|
|
@item locale (from bootmeta)
|
|
|
|
|
@item store-directory-prefix (from bootmeta)
|
|
|
|
|
@item store-crypto-devices (from bootmeta)
|
|
|
|
|
@end enumerate"
|
|
|
|
|
(let* ((bootloader (bootloader-configuration-bootloader bootloader-config))
|
|
|
|
|
(installer (bootloader-installer bootloader))
|
|
|
|
|
(auto-targets (list (bootloader-target
|
|
|
|
|
(type 'root)
|
|
|
|
|
(path root-offset)
|
|
|
|
|
(offset #f))))
|
|
|
|
|
(targets (target-overrides
|
|
|
|
|
overrides
|
|
|
|
|
(bootloader-configuration-targets bootloader-config)
|
|
|
|
|
auto-targets
|
|
|
|
|
(bootloader-default-targets bootloader)))
|
|
|
|
|
(conf (bootloader-configuration
|
|
|
|
|
(inherit bootloader-config)
|
|
|
|
|
(targets (normalize targets)))))
|
|
|
|
|
(apply installer #:bootloader-config conf args)))
|
|
|
|
|
|
|
|
|
|
(define (bootloader-configurations->gexp bootloader-configs . rest)
|
|
|
|
|
(apply gbegin (filter-map (cut apply bootloader-configuration->gexp <> rest)
|
|
|
|
|
bootloader-configs)))
|
|
|
|
|
|
2017-05-15 16:24:18 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
2024-08-06 20:11:17 -04:00
|
|
|
|
;;; Bootloader installation to ESP.
|
2017-05-15 16:24:18 -04:00
|
|
|
|
;;;
|
|
|
|
|
|
2024-08-06 20:11:17 -04:00
|
|
|
|
;; systems currently supported by efi-arch. should be used for packages relying
|
|
|
|
|
;; on it.
|
|
|
|
|
(define %efi-supported-systems
|
|
|
|
|
'("i686-linux" "x86_64-linux" "armhf-linux" "aarch64-linux" "riscv64-linux"))
|
|
|
|
|
|
|
|
|
|
(define* (efi-arch #:key (target (or (%current-target-system) (%current-system)))
|
|
|
|
|
(32? #f))
|
|
|
|
|
"Returns the UEFI architecture name for the current target, in lowercase."
|
|
|
|
|
(cond ((target-x86-32? target) "ia32")
|
|
|
|
|
((target-x86-64? target) (if 32? "ia32" "x64"))
|
|
|
|
|
((target-arm32? target) "arm")
|
|
|
|
|
((target-aarch64? target) (if 32? "arm" "aa64"))
|
|
|
|
|
((target-riscv64? target) (if 32? "riscv32" "riscv64"))
|
|
|
|
|
(else (raise (formatted-message (G_ "no UEFI standard arch for ~a!")
|
|
|
|
|
target)))))
|
|
|
|
|
|
|
|
|
|
(define (lazy-efibootmgr)
|
|
|
|
|
"Lazy-loaded efibootmgr package, in order to prevent circular refs."
|
|
|
|
|
(module-ref (resolve-interface '(gnu packages linux)) 'efibootmgr))
|
|
|
|
|
|
|
|
|
|
(define (install-efi bootloader-config plan)
|
|
|
|
|
"Returns a gexp installing PLAN to the ESP, as denoted by the 'vendir target.
|
|
|
|
|
PLAN is a gexp of a list of '(BUILDER DEST-BASENAME . LABEL) triples, that
|
|
|
|
|
should be in boot order. If the user selects a removable bootloader, only the
|
|
|
|
|
first entry in PLAN is used."
|
|
|
|
|
(match-record bootloader-config <bootloader-configuration>
|
|
|
|
|
(targets efi-removable? 32bit?)
|
|
|
|
|
(if efi-removable?
|
|
|
|
|
;; Hard code the output location to a well-known path recognized by
|
|
|
|
|
;; compliant firmware. See "3.5.1.1 Removable Media Boot Behaviour":
|
|
|
|
|
;; http://www.uefi.org/sites/default/files/resources/UEFI%20Spec%202_6.pdf
|
|
|
|
|
(with-targets targets
|
|
|
|
|
(('esp => (path :path))
|
|
|
|
|
#~(let ((boot #$(string-append path "/EFI/BOOT"))
|
|
|
|
|
(arch #$(string-upcase (efi-arch #:32? 32bit?)))
|
|
|
|
|
(builder (car (car #$plan))))
|
|
|
|
|
(mkdir-p boot)
|
|
|
|
|
;; Only realize the first planspec.
|
|
|
|
|
(builder (string-append boot "/BOOT" arch ".EFI")))))
|
|
|
|
|
;; Install normally if not configured as removable.
|
|
|
|
|
(with-targets targets
|
|
|
|
|
(('vendir => (vendir :path) (loader :devpath) (disk :device))
|
|
|
|
|
#~(install-efi #+(file-append (lazy-efibootmgr) "/sbin/efibootmgr")
|
|
|
|
|
#$vendir #$loader #$disk #$plan))))))
|
|
|
|
|
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(define (efi-bootloader-profile packages files hooks)
|
|
|
|
|
"Creates a profile from the lists of PACKAGES and FILES from the store.
|
|
|
|
|
This profile is meant to be used by the bootloader-installer.
|
2020-10-25 12:59:19 -04:00
|
|
|
|
|
|
|
|
|
FILES is a list of file or directory names from the store, which will be
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
symlinked into the profile. If a directory name ends with '/', then the
|
|
|
|
|
directory content instead of the directory itself will be symlinked into the
|
|
|
|
|
profile.
|
2020-10-25 12:59:19 -04:00
|
|
|
|
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
FILES may contain file like objects produced by procedures like plain-file,
|
2020-11-07 16:15:53 -05:00
|
|
|
|
local-file, etc., or package contents produced with file-append.
|
|
|
|
|
|
|
|
|
|
HOOKS lists additional hook functions to modify the profile."
|
profiles: Hooks honor the #:system parameter of ‘profile-derivation’.
Fixes <https://issues.guix.gnu.org/65225>.
* guix/profiles.scm (info-dir-file, package-cache-file)
(info-dir-file, ghc-package-cache-file, ca-certificate-bundle)
(emacs-subdirs, gdk-pixbuf-loaders-cache-file, glib-schemas)
(gtk-icon-themes, gtk-im-modules, linux-module-database)
(xdg-desktop-database, xdg-mime-database, fonts-dir-file)
(manual-database, manual-database/optional): Add optional #:system
parameter and pass it to ‘gexp->derivation’.
(profile-derivation): Pass HOOK a second parameter, SYSTEM.
* gnu/bootloader.scm (efi-bootloader-profile)[efi-bootloader-profile-hook]:
Add optional #:system parameter and pass it to ‘gexp->derivation’.
* guix/channels.scm (package-cache-file): Likewise.
* tests/profiles.scm ("profile-derivation, #:system, and hooks"): New
test.
Reported-by: Tobias Geerinckx-Rice <me@tobias.gr>
2023-10-19 10:39:06 -04:00
|
|
|
|
(define* (efi-bootloader-profile-hook manifest #:optional system)
|
2020-10-25 12:59:19 -04:00
|
|
|
|
(define build
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(with-imported-modules '((guix build utils))
|
2020-10-25 12:59:19 -04:00
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules ((guix build utils)
|
|
|
|
|
#:select (mkdir-p strip-store-file-name))
|
|
|
|
|
((ice-9 ftw)
|
|
|
|
|
#:select (scandir))
|
|
|
|
|
((srfi srfi-1)
|
|
|
|
|
#:select (append-map every remove))
|
|
|
|
|
((srfi srfi-26)
|
|
|
|
|
#:select (cut)))
|
|
|
|
|
(define (symlink-to file directory transform)
|
|
|
|
|
"Creates a symlink to FILE named (TRANSFORM FILE) in DIRECTORY."
|
|
|
|
|
(symlink file (string-append directory "/" (transform file))))
|
|
|
|
|
(define (directory-content directory)
|
|
|
|
|
"Creates a list of absolute path names inside DIRECTORY."
|
|
|
|
|
(map (lambda (name)
|
|
|
|
|
(string-append directory name))
|
|
|
|
|
(or (scandir directory (lambda (name)
|
|
|
|
|
(not (member name '("." "..")))))
|
|
|
|
|
'())))
|
|
|
|
|
(define name-ends-with-/? (cut string-suffix? "/" <>))
|
|
|
|
|
(define (name-is-store-entry? name)
|
|
|
|
|
"Return #t if NAME is a direct store entry and nothing inside."
|
|
|
|
|
(not (string-index (strip-store-file-name name) #\/)))
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(let* ((files '#$files)
|
2020-10-25 12:59:19 -04:00
|
|
|
|
(directories (filter name-ends-with-/? files))
|
|
|
|
|
(names-from-directories
|
|
|
|
|
(append-map (lambda (directory)
|
|
|
|
|
(directory-content directory))
|
|
|
|
|
directories))
|
|
|
|
|
(names (append names-from-directories
|
|
|
|
|
(remove name-ends-with-/? files))))
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(mkdir-p #$output)
|
2020-10-25 12:59:19 -04:00
|
|
|
|
(if (every file-exists? names)
|
|
|
|
|
(begin
|
|
|
|
|
(for-each (lambda (name)
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(symlink-to name #$output
|
2020-10-25 12:59:19 -04:00
|
|
|
|
(if (name-is-store-entry? name)
|
|
|
|
|
strip-store-file-name
|
|
|
|
|
basename)))
|
|
|
|
|
names)
|
|
|
|
|
#t)
|
|
|
|
|
#f)))))
|
|
|
|
|
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(gexp->derivation "efi-bootloader-profile"
|
2020-10-25 12:59:19 -04:00
|
|
|
|
build
|
profiles: Hooks honor the #:system parameter of ‘profile-derivation’.
Fixes <https://issues.guix.gnu.org/65225>.
* guix/profiles.scm (info-dir-file, package-cache-file)
(info-dir-file, ghc-package-cache-file, ca-certificate-bundle)
(emacs-subdirs, gdk-pixbuf-loaders-cache-file, glib-schemas)
(gtk-icon-themes, gtk-im-modules, linux-module-database)
(xdg-desktop-database, xdg-mime-database, fonts-dir-file)
(manual-database, manual-database/optional): Add optional #:system
parameter and pass it to ‘gexp->derivation’.
(profile-derivation): Pass HOOK a second parameter, SYSTEM.
* gnu/bootloader.scm (efi-bootloader-profile)[efi-bootloader-profile-hook]:
Add optional #:system parameter and pass it to ‘gexp->derivation’.
* guix/channels.scm (package-cache-file): Likewise.
* tests/profiles.scm ("profile-derivation, #:system, and hooks"): New
test.
Reported-by: Tobias Geerinckx-Rice <me@tobias.gr>
2023-10-19 10:39:06 -04:00
|
|
|
|
#:system system
|
2020-10-25 12:59:19 -04:00
|
|
|
|
#:local-build? #t
|
|
|
|
|
#:substitutable? #f
|
|
|
|
|
#:properties
|
|
|
|
|
`((type . profile-hook)
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(hook . efi-bootloader-profile-hook))))
|
2020-10-25 12:59:19 -04:00
|
|
|
|
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(profile (content (packages->manifest packages))
|
|
|
|
|
(name "efi-bootloader-profile")
|
|
|
|
|
(hooks (cons efi-bootloader-profile-hook hooks))
|
2020-10-25 12:59:19 -04:00
|
|
|
|
(locales? #f)
|
|
|
|
|
(allow-collisions? #f)
|
|
|
|
|
(relative-symlinks? #f)))
|
|
|
|
|
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(define* (efi-bootloader-chain final-bootloader
|
2020-10-25 12:59:19 -04:00
|
|
|
|
#:key
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
(packages '())
|
|
|
|
|
(files '())
|
2020-11-07 16:15:53 -05:00
|
|
|
|
(hooks '())
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
installer
|
|
|
|
|
disk-image-installer)
|
|
|
|
|
"Define a chain of bootloaders with the FINAL-BOOTLOADER, optional PACKAGES,
|
|
|
|
|
and optional directories and files from the store given in the list of FILES.
|
2020-10-25 12:59:19 -04:00
|
|
|
|
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
The package of the FINAL-BOOTLOADER and all PACKAGES and FILES will be placed
|
|
|
|
|
in an efi-bootloader-profile, which will be passed to the INSTALLER.
|
|
|
|
|
|
|
|
|
|
FILES may contain file-like objects produced by procedures like plain-file,
|
|
|
|
|
local-file, etc., or package contents produced with file-append.
|
2020-10-25 12:59:19 -04:00
|
|
|
|
|
|
|
|
|
If a directory name in FILES ends with '/', then the directory content instead
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
of the directory itself will be symlinked into the efi-bootloader-profile.
|
2020-10-25 12:59:19 -04:00
|
|
|
|
|
2020-11-07 16:15:53 -05:00
|
|
|
|
The procedures in the HOOKS list can be used to further modify the bootloader
|
|
|
|
|
profile. It is possible to pass a single function instead of a list.
|
2020-10-25 12:59:19 -04:00
|
|
|
|
|
gnu: bootloader: Rework chaining, add grub-efi-netboot-removable-bootloader.
This rework allows to use an (efi-bootloader-chain) like this, which is able
to boot over network or local storage, depending on whether the bootloader
target has support for symbolic links:
(operating-system
(bootloader
(bootloader-configuration
(bootloader
(efi-bootloader-chain
grub-efi-netboot-removable-bootloader
#:packages (list my-firmware-package
my-u-boot-package)
#:files (list (plain-file "config.txt"
"kernel=u-boot.bin"))
#:hooks my-special-bootloader-profile-manipulator))
(targets '("/booti/efi"))
…))
…)
* doc/guix.texi (Bootloader Configuration): Describe the new
‘grub-efi-netboot-removable-bootloader’. Mention the file names used and that
the UEFI Boot Manager is not modified. Advise to disable write-access over
TFTP.
* gnu/bootloader.scm (efi-bootloader-profile): Allow a list of packages and
collect everything directly in the profile, avoiding a separate collection
directory. Renamed the profile from "bootloader-profile" to
"efi-bootloader-profile".
[bootloader-collection]: Rename to...
[efi-bootloader-profile-hook]: ... this and remove unused modules. Do not
create the now extraneous collection directory.
(efi-bootloader-chain): Add PACKAGES and DISK-IMAGE-INSTALLER arguments.
Remove handling of the collection directory, now only calling the given
installer procedure.
* gnu/bootloader/grub.scm (make-grub-efi-netboot-installer): New helper.
(make-grub-configuration): New helper based on (grub-configuration-file). Add
a GRUB argument, fix indentation, remove previous code retrieving GRUB from
CONFIG.
(grub-configuration-file): Make use of make-grub-configuration.
(grub-efi-configuration-file): New procedure.
(grub-cfg): New variable to replace "/boot/grub/grub.cfg".
(install-grub-efi-netboot): Remove, splitting logic to...
(make-grub-efi-netboot-installer): ... this new helper procedure, as well as
to make-grub-efi-netboot, added below.
(grub-bootloader): Adjust to use the GRUB-CFG.
(grub-efi-bootloader): Likewise. Removed inheritance and declare all fields
explicitly.
(make-grub-efi-netboot-bootloader): New procedure.
(grub-efi-netboot-bootloader): Use it.
(grub-efi-netboot-removable-bootloader): New variable.
* gnu/packages/bootloaders.scm (make-grub-efi-netboot): New procedure.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-11-30 19:59:09 -05:00
|
|
|
|
If the INSTALLER argument is used, then this gexp procedure will be called to
|
|
|
|
|
install the efi-bootloader-profile. Otherwise the installer of the
|
|
|
|
|
FINAL-BOOTLOADER will be called.
|
|
|
|
|
|
|
|
|
|
If the DISK-IMAGE-INSTALLER is used, then this gexp procedure will be called
|
|
|
|
|
to install the efi-bootloader-profile into a disk image. Otherwise the
|
|
|
|
|
disk-image-installer of the FINAL-BOOTLOADER will be called."
|
|
|
|
|
(bootloader
|
|
|
|
|
(inherit final-bootloader)
|
|
|
|
|
(name "efi-bootloader-chain")
|
|
|
|
|
(package
|
|
|
|
|
(efi-bootloader-profile (cons (bootloader-package final-bootloader)
|
|
|
|
|
packages)
|
|
|
|
|
files
|
|
|
|
|
(if (list? hooks)
|
|
|
|
|
hooks
|
|
|
|
|
(list hooks))))
|
|
|
|
|
(installer
|
|
|
|
|
(or installer
|
|
|
|
|
(bootloader-installer final-bootloader)))
|
|
|
|
|
(disk-image-installer
|
|
|
|
|
(or disk-image-installer
|
|
|
|
|
(bootloader-disk-image-installer final-bootloader)))))
|