01/05: bootloader: Mark "grub.cfg" and "extlinux.conf" as non-substitutable.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 9512ba6b09b55c1551933c1885aa1ca39457aea8
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jan 3 12:16:52 2020 +0100

    bootloader: Mark "grub.cfg" and "extlinux.conf" as non-substitutable.
    
    Suggested by <address@hidden>.
    
    * gnu/bootloader/grub.scm (grub-configuration-file): Pass #:options to
    'computed-file'.
    * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Likewise.
---
 gnu/bootloader/extlinux.scm | 4 +++-
 gnu/bootloader/grub.scm     | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm
index 4010858..5b4dd84 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 fd62f62..adcdbdb 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 
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2016 Chris Marusich <address@hidden>
 ;;; Copyright © 2017 Leo Famulari <address@hidden>
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
@@ -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)))