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/examples | |
| 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/examples')
| -rw-r--r-- | gnu/system/examples/vm-image.tmpl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index ccb0b045dba..c8449c6e95d 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl | |||
| @@ -123,7 +123,14 @@ root ALL=(ALL) ALL | |||
| 123 | (login-service-type config => | 123 | (login-service-type config => |
| 124 | (login-configuration | 124 | (login-configuration |
| 125 | (inherit config) | 125 | (inherit config) |
| 126 | (motd vm-image-motd))))))) | 126 | (motd vm-image-motd))) |
| 127 | |||
| 128 | ;; Install and run the current Guix rather than an older | ||
| 129 | ;; snapshot. | ||
| 130 | (guix-service-type config => | ||
| 131 | (guix-configuration | ||
| 132 | (inherit config) | ||
| 133 | (guix (current-guix)))))))) | ||
| 127 | 134 | ||
| 128 | ;; Allow resolution of '.local' host names with mDNS. | 135 | ;; Allow resolution of '.local' host names with mDNS. |
| 129 | (name-service-switch %mdns-host-lookup-nss)) | 136 | (name-service-switch %mdns-host-lookup-nss)) |
