diff options
| author | Marius Bakke <[email protected]> | 2022-08-11 22:15:22 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2022-08-11 22:15:22 +0200 |
| commit | b50eaa67642ebc25e9c896f2e700c08610e0a5da (patch) | |
| tree | e3358208e17a836c2e3cdb3125f815a2ab35c2b8 /gnu/system/examples | |
| parent | 7b69cd07408bf64fff026e4597920a90259e3205 (diff) | |
| parent | 99b73f60415b282f2be39134f385cbda4840c336 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/examples')
| -rw-r--r-- | gnu/system/examples/vm-image.tmpl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index ccb0b045db..d46a27978c 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -43,7 +43,9 @@ accounts.\x1b[0m (keyboard-layout (keyboard-layout "us" "altgr-intl")) ;; Label for the GRUB boot menu. - (label (string-append "GNU Guix " (package-version guix))) + (label (string-append "GNU Guix " + (or (getenv "GUIX_DISPLAYED_VERSION") + (package-version guix)))) (firmware '()) @@ -123,7 +125,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)) |