Author: eelco
Date: Thu May 24 23:37:06 2012
New Revision: 34233
URL: https://nixos.org/websvn/nix/?rev=34233&sc=1
Log:
* Work properly if /root/.nix-defexpr/channels already exists.
Modified:
nixos/trunk/modules/installer/tools/nixos-install.sh
Modified: nixos/trunk/modules/installer/tools/nixos-install.sh
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-install.sh Thu May 24
22:07:23 2012 (r34232)
+++ nixos/trunk/modules/installer/tools/nixos-install.sh Thu May 24
23:37:06 2012 (r34233)
@@ -162,7 +162,7 @@
chroot $mountPoint @nix@/bin/nix-env \
-p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
-ln -s /nix/var/nix/profiles/per-user/root/channels
$mountPoint/root/.nix-defexpr/channels
+ln -sfn /nix/var/nix/profiles/per-user/root/channels
$mountPoint/root/.nix-defexpr/channels
# We're done building/downloading, so we don't need the /etc bind
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
