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 /gnu | |
| parent | 682d13bf39be314140e23ff8a875ea7ccdc11331 (diff) | |
| download | guix-a7f15c9ecffc1762f5886fb5a2a14490e2994c8c.tar.gz guix-a7f15c9ecffc1762f5886fb5a2a14490e2994c8c.zip | |
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 'gnu')
| -rw-r--r-- | gnu/tests/reconfigure.scm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm index 00514e7020..bcc7645fa3 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 |