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 | |
| parent | 57f1892d366ea28083391577f90c4aa06b90aaf1 (diff) | |
| download | guix-95a03aa5c507d48e2cde19ea007b8f90a4e0108a.tar.gz | |
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')
| -rw-r--r-- | gnu/system/examples/vm-image.tmpl | 9 | ||||
| -rw-r--r-- | gnu/system/install.scm | 14 |
2 files changed, 18 insertions, 5 deletions
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index ccb0b045db..c8449c6e95 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -123,7 +123,14 @@ root ALL=(ALL) ALL (login-service-type config => (login-configuration (inherit config) - (motd vm-image-motd))))))) + (motd vm-image-motd))) + + ;; Install and run the current Guix rather than an older + ;; snapshot. + (guix-service-type config => + (guix-configuration + (inherit config) + (guix (current-guix)))))))) ;; Allow resolution of '.local' host names with mDNS. (name-service-switch %mdns-host-lookup-nss)) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index a3646b1d54..32b9f52e04 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 ;; network. It can be faster than fetching from remote servers. (service avahi-service-type) - ;; The build daemon. Register the default substitute server key(s) - ;; as trusted to allow the installation process to use substitutes by - ;; default. + ;; The build daemon. (service guix-service-type - (guix-configuration (authorize-key? #t))) + (guix-configuration + ;; Register the default substitute server key(s) as + ;; trusted to allow the installation process to use + ;; substitutes by default. + (authorize-key? #t) + + ;; Install and run the current Guix rather than an older + ;; snapshot. + (guix (current-guix)))) ;; Start udev so that useful device nodes are available. ;; Use device-mapper rules for cryptsetup & co; enable the CRDA for |