From 2e93c9ca29b201dd98d01fe49f8028c98397bed5 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 4 Mar 2017 19:41:13 +0100
Subject: activation-scripts: don't link current system before all
 activationScripts finish

---
 modules/system/activation-scripts.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/system')

diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
index 9d36156..c55c0c3 100644
--- a/modules/system/activation-scripts.nix
+++ b/modules/system/activation-scripts.nix
@@ -50,6 +50,14 @@ in
       # Ensure a consistent umask.
       umask 0022
 
+      ${cfg.activationScripts.nix-daemon.text}
+      ${cfg.activationScripts.nix.text}
+
+      ${cfg.activationScripts.etc.text}
+      ${cfg.activationScripts.launchd.text}
+      ${cfg.activationScripts.time.text}
+      ${cfg.activationScripts.extraActivation.text}
+
       # Make this configuration the current configuration.
       # The readlink is there to ensure that when $systemConfig = /system
       # (which is a symlink to the store), /run/current-system is still
@@ -59,14 +67,6 @@ in
       # Prevent the current configuration from being garbage-collected.
       ln -sfn /run/current-system /nix/var/nix/gcroots/current-system
 
-      ${cfg.activationScripts.nix-daemon.text}
-      ${cfg.activationScripts.nix.text}
-
-      ${cfg.activationScripts.etc.text}
-      ${cfg.activationScripts.launchd.text}
-      ${cfg.activationScripts.time.text}
-      ${cfg.activationScripts.extraActivation.text}
-
       exit $_status
     '';
 
-- 
cgit v1.2.3