syslogd: use DEV_CONSOLE consistently

init: remove obsolete comment

diff --git a/init/init.c b/init/init.c
index 9891087f54e25a9d9cd70079c00543adde0093ec..fe0ec030a7ae45d0771be38c7929eaeb658e89c4 100644 (file)
--- 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 e3abcc7cbb938d51b143214cb7a9cc0f17ac88c9..5998732bd9d342bd5341832231a7c00266f00f74 100644 (file)
--- 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);