summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-06-18 22:57:22 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-18 23:19:51 +0200
commita854525a34c42622a3945ffeb36781ae48a8267e (patch)
tree795ff067bb700d6a2765fcb624171c123d99a2c8
parente8cb9c01c684bed2f47767f0b322f3d40d89781a (diff)
downloadguix-a854525a34c42622a3945ffeb36781ae48a8267e.tar.gz
system: Have /run/setuid-programs first in $PATH.
Fixes <https://bugs.gnu.org/31814>.
Reported by Clément Lassieur <clement@lassieur.org>.

* gnu/system.scm (operating-system-etc-service)["profile"]: Arrange so
that /run/setuid-programs comes first in $PATH.
-rw-r--r--gnu/system.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 7cb12a8276..d367307a24 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -616,9 +616,6 @@ unset PATH
 GUIX_PROFILE=/run/current-system/profile ; \\
 . /run/current-system/profile/etc/profile
 
-# Prepend setuid programs.
-export PATH=/run/setuid-programs:$PATH
-
 # Since 'lshd' does not use pam_env, /etc/environment must be explicitly
 # loaded when someone logs in via SSH.  See <http://bugs.gnu.org/22175>.
 # We need 'PATH' to be defined here, for 'cat' and 'cut'.  Do this before
@@ -645,6 +642,9 @@ do
   fi
 done
 
+# Prepend setuid programs.
+export PATH=/run/setuid-programs:$PATH
+
 # Arrange so that ~/.config/guix/current/share/info comes first.
 export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"