aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2025-05-05 22:40:50 +0200
committerLudovic Courtès <ludo@gnu.org>2025-05-06 00:16:33 +0200
commit94c9e53fa4b45e85c1664a9bab6aea0d5c3ac123 (patch)
treeec380ee8d669e3f26c2ac39d7292311ec5798d73
parent4a32b83753b124169003589fae42eff03ff482cc (diff)
downloadguix-94c9e53fa4b45e85c1664a9bab6aea0d5c3ac123.tar.gz
guix-94c9e53fa4b45e85c1664a9bab6aea0d5c3ac123.zip
install: Do not leak local checkout URL.
Fixes <https://issues.guix.gnu.org/67707>. Previously ‘guix describe’ in the installation image would show the URL of the local checkout that was used to build the image. It now shows the default URL. * gnu/system/install.scm (%installation-services): Change channel of ‘guix’ package to inherit from ‘%default-guix-channel’. Change-Id: If848b5a6166904e982e0f9a0780f3e3f53bdfc28
-rw-r--r--gnu/system/install.scm14
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 15ea401f1c..20960e62b3 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -35,6 +35,11 @@
#:use-module ((guix packages) #:select (package-version supported-package?))
#:use-module (guix platform)
#:use-module (guix utils)
+ #:use-module (guix packages)
+ #:use-module ((guix channels)
+ #:select (%default-guix-channel
+ channel
+ channel-commit))
#:use-module (gnu installer)
#:use-module (gnu system locale)
#:use-module (gnu services avahi)
@@ -392,7 +397,14 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
;; Install and run the current Guix rather than an older
;; snapshot.
- (guix (current-guix))))
+ (guix (let ((guix (current-guix)))
+ (package
+ (inherit guix)
+ ;; Do not leak the local checkout URL.
+ (source (channel
+ (inherit %default-guix-channel)
+ (commit (channel-commit
+ (package-source guix))))))))))
;; Start udev so that useful device nodes are available.
;; Use device-mapper rules for cryptsetup & co; enable the CRDA for