Merge pull request NixOS#87 from kirelagin/clean-path

installer and activation: Sanitise PATH
ethancedwards8 · Aug 1, 2018 · 5702b21 · 5702b21
2 parents 5cdfed8 + 45f0e83
commit 5702b21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
@@ -40,7 +40,7 @@ in
       #! ${stdenv.shell}
       set -e
       set -o pipefail
-      export PATH=${pkgs.coreutils}/bin:@out@/sw/bin:${config.environment.systemPath}
+      export PATH="${pkgs.gnugrep}/bin:${pkgs.coreutils}/bin:@out@/sw/bin:/usr/bin:/bin"
 
       systemConfig=@out@
 
@@ -83,7 +83,7 @@ in
       #! ${stdenv.shell}
       set -e
       set -o pipefail
-      export PATH=${pkgs.coreutils}/bin:@out@/sw/bin:${config.environment.systemPath}
+      export PATH="${pkgs.gnugrep}/bin:${pkgs.coreutils}/bin:@out@/sw/bin:/usr/bin:/bin"
 
       systemConfig=@out@
 

diff --git a/pkgs/darwin-installer/default.nix b/pkgs/darwin-installer/default.nix
@@ -24,6 +24,9 @@ stdenv.mkDerivation {
   shellHook = ''
     set -e
 
+    orig_path="$PATH"
+    export PATH="${pkgs.openssh}/bin:/usr/bin:/bin"  # ssh in case nix needs it
+
     action=switch
     while [ "$#" -gt 0 ]; do
         i="$1"; shift 1
@@ -58,7 +61,7 @@ stdenv.mkDerivation {
         read -p "Would you like edit the default configuration.nix before starting? [y/n] " i
         case "$i" in
             y|Y)
-                ''${EDITOR:-nano} "$config"
+                PATH="$orig_path" ''${EDITOR:-nano} "$config"
                 ;;
         esac
     fi