wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-07 16:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable USE_VAR_RUN_RESOLVCONF for Mandriva, unset TERM

Browse Source 
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 <cmatsuoka@gmail.com>
This commit is contained in:
Claudio Matsuoka committed 2008-09-02 13:03:25 -03:00
1 parent ed4abc952a
commit 4af58f8bb0
1 file changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files
finit-alt.c
+5 -1
View File
@@ -57,7 +57,6 @@ THE SOFTWARE.
#define PAM_CONSOLE #define PAM_CONSOLE
#define LISTEN_INITCTL #define LISTEN_INITCTL
#define RUNLEVEL 5 #define RUNLEVEL 5
#define USE_VAR_RUN_RESOLVCONF
#define USE_MESSAGE_BUS #define USE_MESSAGE_BUS
#elif defined DIST_EEEXUBUNTU /* eeeXubuntu */ #elif defined DIST_EEEXUBUNTU /* eeeXubuntu */
#define RANDOMSEED "/var/lib/urandom/random-seed" #define RANDOMSEED "/var/lib/urandom/random-seed"
@@ -466,6 +465,7 @@ int main()
endutent(); endutent();
#endif #endif
#ifdef USE_ETC_RESOLVCONF_RUN
touch("/etc/resolvconf/run/enable-updates"); touch("/etc/resolvconf/run/enable-updates");
chdir("/etc/resolvconf/run/interface"); chdir("/etc/resolvconf/run/interface");
@@ -475,6 +475,7 @@ int main()
system(RUNPARTS " --arg=i /etc/resolvconf/update.d"); system(RUNPARTS " --arg=i /etc/resolvconf/update.d");
#endif #endif
chdir("/"); chdir("/");
#endif
#ifdef TOUCH_ETC_NETWORK_RUN_IFSTATE #ifdef TOUCH_ETC_NETWORK_RUN_IFSTATE
touch("/etc/network/run/ifstate"); touch("/etc/network/run/ifstate");
@@ -571,6 +572,9 @@ int main()
listen_initctl(); listen_initctl();
#endif #endif
/* Prevents bash from running loadkeys */
unsetenv("TERM");
while (access("/tmp/shutdown", F_OK) < 0) { while (access("/tmp/shutdown", F_OK) < 0) {
_d("start X as %s\n", username); _d("start X as %s\n", username);
#ifdef DEBUG_TIMESTAMP #ifdef DEBUG_TIMESTAMP