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

2 files changed, 8 insertions, 11 deletions

diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm
index 00514e70204..bcc7645fa35 100644
--- a/gnu/tests/reconfigure.scm
+++ b/gnu/tests/reconfigure.scm
@@ -92,15 +92,12 @@ generation of the system profile."
               (length (system-generations marionette))
               (1+ (length generations-prior)))
 
-            (test-assert "script activated the new generation"
-              (and (eqv? 'symlink
-                         (marionette-eval
-                          '(stat:type (lstat "/run/current-system"))
-                          marionette))
-                   (string= #$os
-                            (marionette-eval
-                             '(readlink "/run/current-system")
-                             marionette))))
+            (test-equal "script activated the new generation"
+              (string-append "/var/guix/profiles/system-"
+                             (number->string (+ 1 (length generations-prior)))
+                             "-link")
+              (marionette-eval '(readlink "/run/current-system")
+                               marionette))
 
             (test-assert "script activated user accounts"
               (marionette-eval
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm
index 9418060158a..604ba08feee 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)