Merge pull request #1306 from emilazy/push-kzsqtpuplusw

Revert "{activation-scripts,activate-system}: purify environment"
LnL7 · Jan 28, 2025 · 349a74c · 349a74c
2 parents f43dac4 + cc9c840
commit 349a74c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 deletions.
diff --git a/modules/services/activate-system/default.nix b/modules/services/activate-system/default.nix
@@ -10,14 +10,7 @@
       script = ''
         set -e
         set -o pipefail
-
         export PATH="${pkgs.gnugrep}/bin:${pkgs.coreutils}/bin:@out@/sw/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-        export USER=root
-        export LOGNAME=root
-        export HOME=~root
-        export SHELL=$BASH
-        export LANG=C
-        export LC_CTYPE=UTF-8
 
         systemConfig=$(cat ${config.system.profile}/systemConfig)
 

diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
@@ -37,33 +37,16 @@ in
   config = {
 
     system.activationScripts.script.text = ''
-      #!/usr/bin/env -i ${stdenv.shell}
-      # shellcheck shell=bash
-      # shellcheck disable=SC2096
-
+      #! ${stdenv.shell}
       set -e
       set -o pipefail
-
       export PATH="${pkgs.gnugrep}/bin:${pkgs.coreutils}/bin:@out@/sw/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-      export USER=root
-      export LOGNAME=root
-      export HOME=~root
-      export SHELL=$BASH
-      export LANG=C
-      export LC_CTYPE=UTF-8
 
       systemConfig=@out@
 
       # Ensure a consistent umask.
       umask 0022
 
-      cd /
-
-      if [[ $(id -u) -ne 0 ]]; then
-        printf >&2 '\e[1;31merror: `activate` must be run as root\e[0m\n'
-        exit 2
-      fi
-
       ${cfg.activationScripts.preActivation.text}
 
       # We run `etcChecks` again just in case someone runs `activate`