diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-28 10:06:27 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-28 10:08:42 +0100 |
commit | f8516a0717569f496653821d5fa286da59854550 (patch) | |
tree | ea6164a78fceb85f840c0b7a95e6bf410c7d2254 | |
parent | 3c84ae406d80ba01f96a6da27de954b61f0e735b (diff) |
nixos copySystemConfiguration: fix when chrooted
Fixes #7974. Also makes the description more informative.
-rw-r--r-- | nixos/modules/system/activation/top-level.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index d66580b7b9be..2d1b0ffb54ce 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -178,9 +178,10 @@ in default = false; description = '' If enabled, copies the NixOS configuration file - <literal>$NIXOS_CONFIG</literal> (usually - <filename>/etc/nixos/configuration.nix</filename>) - to the system store path. + (usually <filename>/etc/nixos/configuration.nix</filename>) + and links it from the resulting system + (getting to <filename>/run/current-system/configuration.nix</filename>). + Note that only this single file is copied, even if it imports others. ''; }; @@ -238,7 +239,9 @@ in system.extraSystemBuilderCmds = optionalString config.system.copySystemConfiguration - "cp ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out"; + ''ln -s '${import ../../../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>}' \ + "$out/configuration.nix" + ''; system.build.toplevel = system; |