diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-11 22:15:22 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-11 22:15:22 +0200 |
| commit | b50eaa67642ebc25e9c896f2e700c08610e0a5da (patch) | |
| tree | e3358208e17a836c2e3cdb3125f815a2ab35c2b8 /gnu/system/install.scm | |
| parent | 7b69cd07408bf64fff026e4597920a90259e3205 (diff) | |
| parent | 99b73f60415b282f2be39134f385cbda4840c336 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/install.scm')
| -rw-r--r-- | gnu/system/install.scm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index a3646b1d54..a7b7c246bf 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 @@ -463,7 +469,8 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (bootloader grub-bootloader) (targets '("/dev/sda")))) (label (string-append "GNU Guix installation " - (package-version guix))) + (or (getenv "GUIX_DISPLAYED_VERSION") + (package-version guix)))) ;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon ;; non-functional: |