diff options
| author | Oliver Charles <ollie@ocharles.org.uk> | 2014-04-20 19:17:05 +0100 |
|---|---|---|
| committer | Oliver Charles <ollie@ocharles.org.uk> | 2014-04-20 19:17:05 +0100 |
| commit | 42ae633445a72c4673b4abc3e214a2ddc8227724 (patch) | |
| tree | 0b19dfa036d81786f15348a60d31dbdefbacf986 /nixos/modules/system/activation/top-level.nix | |
| parent | 41775167ac69a001f40c11e2ee9576887e17b8b4 (diff) | |
| parent | 31a94915d2532273e3630206a9e13f2e49ce0775 (diff) | |
| download | nixlib-42ae633445a72c4673b4abc3e214a2ddc8227724.tar nixlib-42ae633445a72c4673b4abc3e214a2ddc8227724.tar.gz nixlib-42ae633445a72c4673b4abc3e214a2ddc8227724.tar.bz2 nixlib-42ae633445a72c4673b4abc3e214a2ddc8227724.tar.lz nixlib-42ae633445a72c4673b4abc3e214a2ddc8227724.tar.xz nixlib-42ae633445a72c4673b4abc3e214a2ddc8227724.tar.zst nixlib-42ae633445a72c4673b4abc3e214a2ddc8227724.zip | |
Merge branch 'master' into dbus-switch-to-configuration
Conflicts: nixos/modules/system/activation/switch-to-configuration.pl
Diffstat (limited to 'nixos/modules/system/activation/top-level.nix')
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 30a529988a96..1600a1fb0104 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -1,6 +1,6 @@ -{ config, pkgs, modules, baseModules, ... }: +{ config, lib, pkgs, modules, baseModules, ... }: -with pkgs.lib; +with lib; let @@ -11,7 +11,7 @@ let # you can provide an easy way to boot the same configuration # as you use, but with another kernel # !!! fix this - cloner = inheritParent: list: with pkgs.lib; + cloner = inheritParent: list: map (childConfig: (import ../../../lib/eval-config.nix { inherit baseModules; @@ -68,6 +68,7 @@ let echo -n "$configurationName" > $out/configuration-name echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version echo -n "$nixosVersion" > $out/nixos-version + echo -n "$system" > $out/system mkdir $out/fine-tune childCount=0 |