* Merge some stuff from the trunk.

svn path=/nixos/branches/modular-nixos/; revision=16051
2009-06-26 11:36:38 +00:00
parent f61a3ebd2c d5fbea2dbb
commit 0d5ea86748
4 changed files with 115 additions and 0 deletions
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -1,3 +1,7 @@
+if [ -n "$NOSYSBASHRC" ]; then
+    return
+fi
+
 # Initialise a bunch of environment variables.
 export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib