summary refs log tree commit diff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-04 16:07:09 +0200
committerLudovic Courtès <ludo@gnu.org>2014-06-04 18:15:50 +0200
commit2c5c696c39b2d80b1e1b1f477822a6711d779b71 (patch)
treede72ce0c717bf6c1734797fdd33b70fb1f6625f4 /gnu/system
parent202adef2ec8d7bbfb6a7c216e96b2306e03c759f (diff)
downloadguix-2c5c696c39b2d80b1e1b1f477822a6711d779b71.tar.gz
install: Register the hydra.gnu.org key on the installation image.
* gnu/services/base.scm (hydra-key-authorization): New procedure.
  (guix-service): Add #:authorize-hydra-key? parameter; honor it using
  'hydra-key-authorization'.
* gnu/system/install.scm (installation-services): Pass
  #:authorize-hydra-key? #t.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/install.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index c69e51b2b5..707f6b6c86 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -77,7 +77,12 @@ You have been warned.  Thanks for being so brave.
 
           ;; The usual services.
           (syslog-service)
-          (guix-service)
+
+          ;; The build daemon.  Register the hydra.gnu.org key as trusted.
+          ;; This allows the installation process to use substitutes by
+          ;; default.
+          (guix-service #:authorize-hydra-key? #t)
+
           (nscd-service))))
 
 (define %issue