diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-06-19 17:02:16 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-19 17:02:16 +0200 |
commit | 0106d6b40dc0b8f1c81326e633bfa5134a446a9c (patch) | |
tree | 978cc8408f2d52a024f692a31e98cb555da95462 /gnu/system.scm | |
parent | 7e66e0b3e7f69e045362f9452f9b745aa850d354 (diff) | |
parent | 793a66e5fef3f562080000280c022af517aad612 (diff) | |
download | guix-0106d6b40dc0b8f1c81326e633bfa5134a446a9c.tar guix-0106d6b40dc0b8f1c81326e633bfa5134a446a9c.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 6 |
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\" |