From a7f15c9ecffc1762f5886fb5a2a14490e2994c8c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 6 Apr 2024 16:31:54 +0200
Subject: reconfigure: /run/current-system points to generation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* 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
---
gnu/tests/reconfigure.scm | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
(limited to 'gnu/tests')
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 @@ (define (system-generations marionette)
(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
--
cgit v1.2.3