Annotation of /trunk/slim/patches/slim-1.3.2-fix-keyboard-in-tty-from-which-slim-is-lauched.patch
Parent Directory | Revision Log
Revision 1262 -
(hide annotations)
(download)
Thu Jan 27 23:28:25 2011 UTC (13 years, 8 months ago) by niro
File size: 754 byte(s)
Thu Jan 27 23:28:25 2011 UTC (13 years, 8 months ago) by niro
File size: 754 byte(s)
added slim patches from upstream
1 | niro | 1262 | --- app.cpp.orig 2009-01-13 11:30:36.000000000 +0900 |
2 | +++ app.cpp 2009-01-13 11:32:27.000000000 +0900 | ||
3 | @@ -270,21 +270,22 @@ | ||
4 | signal(SIGALRM, AlarmSignal); | ||
5 | |||
6 | #ifndef XNEST_DEBUG | ||
7 | - OpenLog(); | ||
8 | - | ||
9 | if (!force_nodaemon && cfg->getOption("daemon") == "yes") { | ||
10 | daemonmode = true; | ||
11 | } | ||
12 | |||
13 | // Daemonize | ||
14 | if (daemonmode) { | ||
15 | - if (daemon(0, 1) == -1) { | ||
16 | + if (daemon(0, 0) == -1) { | ||
17 | cerr << APPNAME << ": " << strerror(errno) << endl; | ||
18 | exit(ERR_EXIT); | ||
19 | } | ||
20 | - UpdatePid(); | ||
21 | } | ||
22 | |||
23 | + OpenLog(); | ||
24 | + | ||
25 | + if (daemonmode) UpdatePid(); | ||
26 | + | ||
27 | CreateServerAuth(); | ||
28 | StartServer(); | ||
29 | alarm(2); |