| 1 |
commit: 2bb3c6940c3000924d145515832797ae5bf29f31 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 3 09:31:08 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 09:31:08 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2bb3c694 |
| 7 |
|
| 8 |
scripts/startprefix: retain some more useful env vars |
| 9 |
|
| 10 |
scripts/startprefix.in | 10 ++++++++-- |
| 11 |
1 file changed, 8 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/scripts/startprefix.in b/scripts/startprefix.in |
| 14 |
index aafd04d..861f02d 100644 |
| 15 |
--- a/scripts/startprefix.in |
| 16 |
+++ b/scripts/startprefix.in |
| 17 |
@@ -37,9 +37,15 @@ fi |
| 18 |
# give a small notice |
| 19 |
echo "Entering Gentoo Prefix ${EPREFIX}" |
| 20 |
# start the login shell, clean the entire environment but what's needed |
| 21 |
+RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL" |
| 22 |
# PROFILEREAD is necessary on SUSE not to wipe the env on shell start |
| 23 |
-[[ -n ${PROFILEREAD} ]] && DOPROFILEREAD="PROFILEREAD=${PROFILEREAD}" |
| 24 |
-env -i HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL $DOPROFILEREAD $SHELL -l |
| 25 |
+[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD" |
| 26 |
+# ssh-agent is handy to keep, of if set, inherit it |
| 27 |
+[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK" |
| 28 |
+# if we're on some X terminal, makes sense to inherit that too |
| 29 |
+[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY" |
| 30 |
+# do it! |
| 31 |
+env -i $RETAIN $SHELL -l |
| 32 |
# and leave a message when we exit... the shell might return non-zero |
| 33 |
# without having real problems, so don't send alarming messages about |
| 34 |
# that |
Archives