about summary refs log tree commit diff
path: root/nixos/modules/installer/tools
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-02-27 20:21:23 +0100
committerEelco Dolstra <edolstra@gmail.com>2018-02-27 20:21:23 +0100
commit84f93dd07ab91a4089de2eb329e1bc080fc5a294 (patch)
tree85b80dc262e0efd1183972078189f4b6b20481ff /nixos/modules/installer/tools
parentb14d9e15686366cf456c9d744cfc90759ea1b3e7 (diff)
downloadnixlib-84f93dd07ab91a4089de2eb329e1bc080fc5a294.tar
nixlib-84f93dd07ab91a4089de2eb329e1bc080fc5a294.tar.gz
nixlib-84f93dd07ab91a4089de2eb329e1bc080fc5a294.tar.bz2
nixlib-84f93dd07ab91a4089de2eb329e1bc080fc5a294.tar.lz
nixlib-84f93dd07ab91a4089de2eb329e1bc080fc5a294.tar.xz
nixlib-84f93dd07ab91a4089de2eb329e1bc080fc5a294.tar.zst
nixlib-84f93dd07ab91a4089de2eb329e1bc080fc5a294.zip
nixos-install: Create /root/.nix-defexpr
This was previously done by nixos-prepare-root.
Diffstat (limited to 'nixos/modules/installer/tools')
-rw-r--r--nixos/modules/installer/tools/nixos-install.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 87013dc8f977..22c1e0fe9a34 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -115,6 +115,8 @@ if [[ -z $noChannelCopy ]]; then
         mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root
         nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \
                 -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet
+        install -m 0700 -d $mountPoint/root/.nix-defexpr
+        ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
     fi
 fi