diff options
| author | Marius Bakke <[email protected]> | 2020-01-03 19:41:05 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-01-03 19:41:05 +0100 |
| commit | 982eff9e841f3539e4ecf93669435a290bfde571 (patch) | |
| tree | b1e3f6fc85c6c35c264f091eb2fc5cff8514c230 /gnu/bootloader | |
| parent | 7ba6d70e4528201151195e1ed2175ee4828bdb2f (diff) | |
| parent | 7158fe4ded47a599ceb8d556132ba83fcc686962 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/extlinux.scm | 4 | ||||
| -rw-r--r-- | gnu/bootloader/grub.scm | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index 40108584a8..5b4dd84965 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -74,7 +74,9 @@ TIMEOUT ~a~%" (format port "~%")) #~()))))) - (computed-file "extlinux.conf" builder)) + (computed-file "extlinux.conf" builder + #:options '(#:local-build? #t + #:substitutable? #f))) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index d984d5f5e3..adcdbdbab0 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <[email protected]> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <[email protected]> ;;; Copyright © 2016 Chris Marusich <[email protected]> ;;; Copyright © 2017 Leo Famulari <[email protected]> ;;; Copyright © 2017 Mathieu Othacehe <[email protected]> @@ -384,9 +384,19 @@ set timeout=~a~%" submenu \"GNU system, old configurations...\" {~%") #$@(map menu-entry->gexp old-entries) (format port "}~%")) - #~())))) - - (computed-file "grub.cfg" builder)) + #~()) + (format port " +if [ \"${grub_platform}\" == efi ]; then + menuentry \"Firmware setup\" { + fwsetup + } +fi~%")))) + + ;; Since this file is rather unique, there's no point in trying to + ;; substitute it. + (computed-file "grub.cfg" builder + #:options '(#:local-build? #t + #:substitutable? #f))) |