From 4af58f8bb060cf29ca52b9ce023ab5ef87343b33 Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka Date: Tue, 2 Sep 2008 13:03:25 -0300 Subject: [PATCH] Disable USE_VAR_RUN_RESOLVCONF for Mandriva, unset TERM Unsetting TERM in distributions using bash as /bin/sh prevents execution of loadkeys from bashrc when creating the user environment to run X Signed-off-by: Claudio Matsuoka --- finit-alt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/finit-alt.c b/finit-alt.c index 7b3c8124..67928938 100644 --- a/finit-alt.c +++ b/finit-alt.c @@ -57,7 +57,6 @@ THE SOFTWARE. #define PAM_CONSOLE #define LISTEN_INITCTL #define RUNLEVEL 5 -#define USE_VAR_RUN_RESOLVCONF #define USE_MESSAGE_BUS #elif defined DIST_EEEXUBUNTU /* eeeXubuntu */ #define RANDOMSEED "/var/lib/urandom/random-seed" @@ -466,6 +465,7 @@ int main() endutent(); #endif +#ifdef USE_ETC_RESOLVCONF_RUN touch("/etc/resolvconf/run/enable-updates"); chdir("/etc/resolvconf/run/interface"); @@ -475,6 +475,7 @@ int main() system(RUNPARTS " --arg=i /etc/resolvconf/update.d"); #endif chdir("/"); +#endif #ifdef TOUCH_ETC_NETWORK_RUN_IFSTATE touch("/etc/network/run/ifstate"); @@ -571,6 +572,9 @@ int main() listen_initctl(); #endif + /* Prevents bash from running loadkeys */ + unsetenv("TERM"); + while (access("/tmp/shutdown", F_OK) < 0) { _d("start X as %s\n", username); #ifdef DEBUG_TIMESTAMP