diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-08-09 10:46:07 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-08-09 15:16:06 +0200 |
| commit | 95a03aa5c507d48e2cde19ea007b8f90a4e0108a (patch) | |
| tree | fa93b5e9f4cca5eee91f00ee30538e96705dedd2 /gnu/system/install.scm | |
| parent | 57f1892d366ea28083391577f90c4aa06b90aaf1 (diff) | |
system: install: Always use 'current-guix'.
Fixes <https://issues.guix.gnu.org/53210>.
Reported by Mathieu Othacehe <othacehe@gnu.org>.
* gnu/system/install.scm (%installation-services): Set 'guix' to
use (current-guix) in 'guix-configuration'.
* gnu/system/examples/vm-image.tmpl: Likewise.
* gnu/tests/install.scm (operating-system-with-current-guix): Remove.
(run-install, installation-os-for-gui-tests): Remove its uses.
* Makefile.am (release): Remove intermediate use of
'update-guix-package.scm' and subsequent 'git commit' invocation.
Diffstat (limited to 'gnu/system/install.scm')
| -rw-r--r-- | gnu/system/install.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index a3646b1d548..32b9f52e04d 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm | |||
| @@ -357,11 +357,17 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m | |||
| 357 | ;; network. It can be faster than fetching from remote servers. | 357 | ;; network. It can be faster than fetching from remote servers. |
| 358 | (service avahi-service-type) | 358 | (service avahi-service-type) |
| 359 | 359 | ||
| 360 | ;; The build daemon. Register the default substitute server key(s) | 360 | ;; The build daemon. |
| 361 | ;; as trusted to allow the installation process to use substitutes by | ||
| 362 | ;; default. | ||
| 363 | (service guix-service-type | 361 | (service guix-service-type |
| 364 | (guix-configuration (authorize-key? #t))) | 362 | (guix-configuration |
| 363 | ;; Register the default substitute server key(s) as | ||
| 364 | ;; trusted to allow the installation process to use | ||
| 365 | ;; substitutes by default. | ||
| 366 | (authorize-key? #t) | ||
| 367 | |||
| 368 | ;; Install and run the current Guix rather than an older | ||
| 369 | ;; snapshot. | ||
| 370 | (guix (current-guix)))) | ||
| 365 | 371 | ||
| 366 | ;; Start udev so that useful device nodes are available. | 372 | ;; Start udev so that useful device nodes are available. |
| 367 | ;; Use device-mapper rules for cryptsetup & co; enable the CRDA for | 373 | ;; Use device-mapper rules for cryptsetup & co; enable the CRDA for |
