Remove STARTX from configurable parameters

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>
This commit is contained in:
Claudio Matsuoka committed 2008-01-03 17:15:34 -02:00
1 parent 31a2e5bfdb
commit efebaf05e6
1 file changed
+3 -5
+3 -5
View File
@@ -38,7 +38,6 @@
#define GETTY "/sbin/mingetty tty3" #define GETTY "/sbin/mingetty tty3"
#define RUNPARTS "/usr/bin/run-parts --arg=-i" #define RUNPARTS "/usr/bin/run-parts --arg=-i"
#define DEFUSER "u" #define DEFUSER "u"
#define STARTX "/usr/bin/startx"
#define HOMEDEV "/dev/sda3" #define HOMEDEV "/dev/sda3"
#define AGPDRV "intel-agp" #define AGPDRV "intel-agp"
#define SERVICES "/etc/rc" #define SERVICES "/etc/rc"
@@ -50,7 +49,6 @@
#define GETTY "/sbin/getty 38400 tty3" #define GETTY "/sbin/getty 38400 tty3"
#define RUNPARTS "/bin/run-parts --arg=-i" #define RUNPARTS "/bin/run-parts --arg=-i"
#define DEFUSER "user" #define DEFUSER "user"
#define STARTX "startx"
#define SERVICES "/usr/sbin/services.sh" #define SERVICES "/usr/sbin/services.sh"
#define TOUCH_ETC_NETWORK_RUN_IFSTATE #define TOUCH_ETC_NETWORK_RUN_IFSTATE
#endif #endif
@@ -301,12 +299,12 @@ int main()
#endif #endif
while (access("/tmp/shutdown", F_OK) < 0) { while (access("/tmp/shutdown", F_OK) < 0) {
debug("run " STARTX " as " DEFUSER); debug("start X as " DEFUSER);
#ifdef DEBUG #ifdef DEBUG
system("su -c " STARTX " -l " DEFUSER); system("su -c startx -l " DEFUSER);
system("/bin/sh"); system("/bin/sh");
#else #else
system("su -c " STARTX " -l " DEFUSER " &> /dev/null"); system("su -c startx -l " DEFUSER " &> /dev/null");
#endif #endif
} }