svn commit: trunk/busybox: init sysklogd
vda at busybox.net
vda at busybox.net
Sun Nov 18 05:43:07 UTC 2007
Author: vda
Date: 2007-11-17 21:43:05 -0800 (Sat, 17 Nov 2007)
New Revision: 20446
Log:
syslogd: use DEV_CONSOLE consistently
init: remove obsolete comment
Modified:
trunk/busybox/init/init.c
trunk/busybox/sysklogd/syslogd.c
Changeset:
Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c 2007-11-18 05:36:50 UTC (rev 20445)
+++ trunk/busybox/init/init.c 2007-11-18 05:43:05 UTC (rev 20446)
@@ -11,9 +11,6 @@
#include "libbb.h"
#include <paths.h>
-//#include <signal.h>
-//#include <sys/ioctl.h>
-//#include <sys/wait.h>
#include <sys/reboot.h>
#if ENABLE_FEATURE_INIT_SYSLOG
@@ -977,7 +974,6 @@
BB_EXECVP(argv[0], argv);
} else if (enforce > 0) {
/* SELinux in enforcing mode but load_policy failed */
- /* At this point, we probably can't open /dev/console, so log() won't work */
message(L_CONSOLE, "Cannot load SELinux Policy. "
"Machine is in enforcing mode. Halting now.");
exit(1);
Modified: trunk/busybox/sysklogd/syslogd.c
===================================================================
--- trunk/busybox/sysklogd/syslogd.c 2007-11-18 05:36:50 UTC (rev 20445)
+++ trunk/busybox/sysklogd/syslogd.c 2007-11-18 05:43:05 UTC (rev 20446)
@@ -299,7 +299,7 @@
| O_NOCTTY | O_APPEND | O_NONBLOCK);
if (G.logFD < 0) {
/* cannot open logfile? - print to /dev/console then */
- int fd = device_open(_PATH_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK);
+ int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK);
if (fd < 0)
fd = 2; /* then stderr, dammit */
full_write(fd, msg, len);
More information about the busybox-cvs
mailing list