diff options
| author | Marius Bakke <[email protected]> | 2022-08-11 23:36:10 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2022-08-11 23:36:10 +0200 |
| commit | 77eb3008e350c069e0ae8df6a91bf0ebdcfc2ac0 (patch) | |
| tree | b899e65aa79099be3f4b27dfcd565bb143681211 /gnu/system/examples | |
| parent | f7e8be231806a904e6817e8ab3404b32f2511db2 (diff) | |
| parent | b50eaa67642ebc25e9c896f2e700c08610e0a5da (diff) | |
Merge branch 'staging' into core-updates
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)) |