From 362f0f752b972ac2cb83dce972e5271f638633d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 16:47:14 +0000
Subject: [PATCH] * Don't put every package in the boot environment in $PATH
 but rather   create a symlink tree and put that in $PATH.

svn path=/nixos/trunk/; revision=7161
---
 boot/boot-stage-2-init.sh          |  9 ++-------
 boot/boot-stage-2.nix              | 30 ++++++++++++++++++++++++------
 configuration/boot-environment.nix |  2 +-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 009e9af7c87..ee18c320c97 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -11,7 +11,7 @@ echo
 
 # Set the PATH.
 export PATH=/empty
-for i in @path@; do
+for i in @startPath@; do
     PATH=$PATH:$i/bin
     if test -e $i/sbin; then
         PATH=$PATH:$i/sbin
@@ -135,12 +135,7 @@ EOF
 
 
 # Additional path for the interactive shell.
-for i in @extraPath@; do
-    PATH=$PATH:$i/bin
-    if test -e $i/sbin; then
-        PATH=$PATH:$i/sbin
-    fi
-done
+PATH=@fullPath@/bin:@fullPath@/sbin
 
 cat > /etc/profile <<EOF
 export PATH=$PATH
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index 7d73e37cb4f..9c1640bc455 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -1,4 +1,4 @@
-{ genericSubstituter, shell, coreutils, findutils
+{ genericSubstituter, buildEnv, shell, coreutils, findutils
 , utillinux, kernel, udev, upstart
 , path ? []
 
@@ -12,16 +12,34 @@
 , hostName
 }:
 
-genericSubstituter {
-  src = ./boot-stage-2-init.sh;
-  isExecutable = true;
-  inherit shell kernel upstart readOnlyRoot upstartJobs hostName;
-  path = [
+let
+
+  startPath = [
     coreutils
     findutils
     utillinux
     udev
     upstart
   ];
+
+in
+
+genericSubstituter {
+  src = ./boot-stage-2-init.sh;
+  isExecutable = true;
+  inherit shell kernel upstart readOnlyRoot upstartJobs hostName;
+  inherit startPath;
+
+  # We don't want to put all of `startPath' and `path' in $PATH, since
+  # then we get an embarrassingly long $PATH.  So use the user
+  # environment builder to make a directory with symlinks to those
+  # packages.
+  fullPath = buildEnv {
+    name = "boot-stage-2-path";
+    paths = startPath ++ path;
+    pathsToLink = ["/bin" "/sbin" "/man/man1" "/share/man/man1"];
+    ignoreCollisions = true;
+  };
+  
   extraPath = path;
 }
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index b38c73b0035..885c994eea7 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -182,7 +182,7 @@ rec {
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ../boot/boot-stage-2.nix {
-    inherit (pkgs) genericSubstituter coreutils findutils
+    inherit (pkgs) genericSubstituter buildEnv coreutils findutils
       utillinux kernel udev upstart;
     inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";