me
/
guix
Archived
1
0
Fork 0
Code

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
master
Ludovic Courtès 2024-04-06 16:31:54 +02:00
parent 682d13bf39
commit a7f15c9ecf
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/tests/reconfigure.scm
View File

@ -92,15 +92,12 @@ generation of the system profile."
(length (system-generations marionette)) (length (system-generations marionette))
(1+ (length generations-prior))) (1+ (length generations-prior)))
(test-assert "script activated the new generation" (test-equal "script activated the new generation"
(and (eqv? 'symlink (string-append "/var/guix/profiles/system-"
(marionette-eval (number->string (+ 1 (length generations-prior)))
'(stat:type (lstat "/run/current-system")) "-link")
(marionette-eval '(readlink "/run/current-system")
marionette)) marionette))
(string= #$os
(marionette-eval
'(readlink "/run/current-system")
marionette))))
(test-assert "script activated user accounts" (test-assert "script activated user accounts"
(marionette-eval (marionette-eval

4
guix/scripts/system/reconfigure.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017, 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016, 2017, 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@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))) (generation (generation-file-name profile number)))
(switch-symlinks generation #$os) (switch-symlinks generation #$os)
(switch-symlinks profile generation) (switch-symlinks profile generation)
(setenv "GUIX_NEW_SYSTEM" #$os) (setenv "GUIX_NEW_SYSTEM" generation)
(primitive-load #$(operating-system-activation-script os)))))))) (primitive-load #$(operating-system-activation-script os))))))))
(define* (switch-to-system eval os #:optional profile) (define* (switch-to-system eval os #:optional profile)