diff options
| author | Karel Zak | 2011-10-06 00:56:32 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-10-26 23:17:18 +0200 |
| commit | 9f7293ea88d8fdbd58f66949ec5d230d09bed50d (patch) | |
| tree | 6967f7f4fec62a57c32bb3ba2dcc7f4158983fcf /login-utils/login.c | |
| parent | login: add -H option for compatibility with Suse (diff) | |
| download | kernel-qcow2-util-linux-9f7293ea88d8fdbd58f66949ec5d230d09bed50d.tar.gz kernel-qcow2-util-linux-9f7293ea88d8fdbd58f66949ec5d230d09bed50d.tar.xz kernel-qcow2-util-linux-9f7293ea88d8fdbd58f66949ec5d230d09bed50d.zip | |
login: use ENV_PATH and ENV_{ROOT,SU}PATH from login.defs
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'login-utils/login.c')
| -rw-r--r-- | login-utils/login.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/login-utils/login.c b/login-utils/login.c index ed9a888ca..adc9aa584 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -1111,10 +1111,18 @@ static void init_environ(struct login_context *cxt) } setenv("HOME", pwd->pw_dir, 0); /* legal to override */ - setenv("PATH", pwd->pw_uid ? _PATH_DEFPATH : _PATH_DEFPATH_ROOT, 1); setenv("SHELL", pwd->pw_shell, 1); setenv("TERM", termenv, 1); + if (pwd->pw_uid) + setenv("PATH", getlogindefs_str("ENV_PATH", _PATH_DEFPATH), 1); + else { + const char *x = getlogindefs_str("ENV_ROOTPATH", NULL); + if (!x) + x = getlogindefs_str("ENV_SUPATH", _PATH_DEFPATH_ROOT); + setenv("PATH", x, 1); + } + /* mailx will give a funny error msg if you forget this one */ len = snprintf(tmp, sizeof(tmp), "%s/%s", _PATH_MAILDIR, pwd->pw_name); if (len > 0 && (size_t) len + 1 <= sizeof(tmp)) |