diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-04-06 16:31:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-04-08 00:05:48 +0200 |
| commit | a7f15c9ecffc1762f5886fb5a2a14490e2994c8c (patch) | |
| tree | 01cd44d6b4790b1acbb90f130b6ddb9171d9dd2f /guix | |
| parent | 682d13bf39be314140e23ff8a875ea7ccdc11331 (diff) | |
| download | guix-a7f15c9ecffc1762f5886fb5a2a14490e2994c8c.tar guix-a7f15c9ecffc1762f5886fb5a2a14490e2994c8c.tar.gz | |
reconfigure: /run/current-system points to generation.
* guix/scripts/system/reconfigure.scm (switch-system-program): Set
‘GUIX_NEW_SYSTEM’ to GENERATION rather than OS, for consistency with
what ‘boot-system’ does.
* gnu/tests/reconfigure.scm (run-switch-to-system-test)
["script activated the new generation"]: Adjust accordingly.
Change-Id: I57b693606a41b8c952df32bbdc2b9120c6dbfd6a
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/system/reconfigure.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 9418060158..604ba08fee 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017, 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> @@ -106,7 +106,7 @@ atomically, and run OS's activation script." (generation (generation-file-name profile number))) (switch-symlinks generation #$os) (switch-symlinks profile generation) - (setenv "GUIX_NEW_SYSTEM" #$os) + (setenv "GUIX_NEW_SYSTEM" generation) (primitive-load #$(operating-system-activation-script os)))))))) (define* (switch-to-system eval os #:optional profile) |