diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
| commit | fe6d003908fd8278de65761bc550240c520ef9f4 (patch) | |
| tree | abe88c7905a8907ddafc554fbeef5b0af08f835d /gnu/bootloader.scm | |
| parent | 8a7a5dc7805f4628e60f90af6b2416f951d0c034 (diff) | |
| parent | 031315e4f0fbc4e04ffc8adee04128c23173a1f7 (diff) | |
| download | guix-fe6d003908fd8278de65761bc550240c520ef9f4.tar guix-fe6d003908fd8278de65761bc550240c520ef9f4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/bootloader.scm')
| -rw-r--r-- | gnu/bootloader.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 01bdd4acaa..668caa7fc3 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 David Craven <david@craven.ch> -;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; @@ -42,6 +42,7 @@ bootloader-name bootloader-package bootloader-installer + bootloader-disk-image-installer bootloader-configuration-file bootloader-configuration-file-generator @@ -125,6 +126,8 @@ record." (name bootloader-name) (package bootloader-package) (installer bootloader-installer) + (disk-image-installer bootloader-disk-image-installer + (default #f)) (configuration-file bootloader-configuration-file) (configuration-file-generator bootloader-configuration-file-generator)) |