From 6d49355d8b69869ba46c7ca6a98eafc5dc6c4c64 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 12 Sep 2014 17:41:06 +0200
Subject: activation: Honor $GUIX_NEW_SYSTEM for use by 'guix system
 reconfigure'.

* gnu/build/activation.scm (activate-current-system): Honor
  $GUIX_NEW_SYSTEM by default.
* guix/scripts/system.scm (switch-to-system): Set $GUIX_NEW_SYSTEM
  before loading SCRIPT.
---
 guix/scripts/system.scm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'guix/scripts/system.scm')

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 7c0dde9030..056c8e6d30 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -199,6 +199,9 @@ it atomically, and then run OS's activation script."
       ;; The activation script may change $PATH, among others, so protect
       ;; against that.
       (return (save-environment-excursion
+               ;; Tell 'activate-current-system' what the new system is.
+               (setenv "GUIX_NEW_SYSTEM" system)
+
                (primitive-load (derivation->output-path script))))
 
       ;; TODO: Run 'deco reload ...'.
-- 
cgit v1.2.3