diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-03-04 19:41:13 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-03-04 19:41:13 +0100 |
| commit | 2e93c9ca29b201dd98d01fe49f8028c98397bed5 (patch) | |
| tree | b6ea009fa66279ac63e6a73a8a61be9281e33a2e /modules/system | |
| parent | 328ce04664555d94154113894a1fd9fa97f0dec6 (diff) | |
activation-scripts: don't link current system before all activationScripts finish
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/activation-scripts.nix | 16 |
1 files changed, 8 insertions, 8 deletions
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 ''; |