diff options
| author | Denis Vlasenko | 2007-11-18 05:43:05 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-11-18 05:43:05 +0000 |
| commit | 70ab28f90776de54cd136a411b2914b1b88cc3de (patch) | |
| tree | 29fa4f8623d91ff11ade01416f7d0ac0ae5d09ee | |
| parent | fbe5f39f0fe0439678581fdad153f1df437f395d (diff) | |
| download | busybox-70ab28f90776de54cd136a411b2914b1b88cc3de.zip busybox-70ab28f90776de54cd136a411b2914b1b88cc3de.tar.gz | |
syslogd: use DEV_CONSOLE consistently
init: remove obsolete comment
| -rw-r--r-- | init/init.c | 4 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/init/init.c b/init/init.c index 9891087..fe0ec03 100644 --- a/init/init.c +++ b/init/init.c @@ -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 @@ int init_main(int argc, char **argv) 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); diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index e3abcc7..5998732 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -299,7 +299,7 @@ static void log_locally(char *msg) | 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); |