aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-03 12:16:52 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-03 16:06:26 +0100
commit9512ba6b09b55c1551933c1885aa1ca39457aea8 (patch)
tree10cb2355e9620ec8063ed0256758a427c6b722ba
parent10a8fb475b739d7046b7c2e3a81788aa9c652f80 (diff)
downloadguix-9512ba6b09b55c1551933c1885aa1ca39457aea8.tar
guix-9512ba6b09b55c1551933c1885aa1ca39457aea8.tar.gz
bootloader: Mark "grub.cfg" and "extlinux.conf" as non-substitutable.
Suggested by <pkill9@runbox.com>. * gnu/bootloader/grub.scm (grub-configuration-file): Pass #:options to 'computed-file'. * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Likewise.
-rw-r--r--gnu/bootloader/extlinux.scm4
-rw-r--r--gnu/bootloader/grub.scm8
2 files changed, 9 insertions, 3 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 fd62f627a0..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 <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -392,7 +392,11 @@ if [ \"${grub_platform}\" == efi ]; then
}
fi~%"))))
- (computed-file "grub.cfg" builder))
+ ;; 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)))