aboutsummaryrefslogtreecommitdiff
path: root/init/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/init.c')
-rw-r--r--init/init.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/init/init.c b/init/init.c
index 698563228..02a33274a 100644
--- a/init/init.c
+++ b/init/init.c
@@ -16,7 +16,7 @@
16#include <sys/wait.h> 16#include <sys/wait.h>
17#include <sys/reboot.h> 17#include <sys/reboot.h>
18 18
19#if ENABLE_SYSLOGD 19#if ENABLE_FEATURE_INIT_SYSLOG
20# include <sys/syslog.h> 20# include <sys/syslog.h>
21#endif 21#endif
22 22
@@ -84,7 +84,7 @@ struct init_action {
84/* Static variables */ 84/* Static variables */
85static struct init_action *init_action_list = NULL; 85static struct init_action *init_action_list = NULL;
86 86
87#if !ENABLE_SYSLOGD 87#if !ENABLE_FEATURE_INIT_SYSLOG
88static const char *log_console = VC_5; 88static const char *log_console = VC_5;
89#endif 89#endif
90#if !ENABLE_DEBUG_INIT 90#if !ENABLE_DEBUG_INIT
@@ -144,7 +144,7 @@ static void message(int device, const char *fmt, ...)
144 __attribute__ ((format(printf, 2, 3))); 144 __attribute__ ((format(printf, 2, 3)));
145static void message(int device, const char *fmt, ...) 145static void message(int device, const char *fmt, ...)
146{ 146{
147#if !ENABLE_SYSLOGD 147#if !ENABLE_FEATURE_INIT_SYSLOG
148 static int log_fd = -1; 148 static int log_fd = -1;
149#endif 149#endif
150 150
@@ -159,7 +159,7 @@ static void message(int device, const char *fmt, ...)
159 msg[sizeof(msg) - 2] = '\0'; 159 msg[sizeof(msg) - 2] = '\0';
160 l = strlen(msg); 160 l = strlen(msg);
161 161
162#if ENABLE_SYSLOGD 162#if ENABLE_FEATURE_INIT_SYSLOG
163 /* Log the message to syslogd */ 163 /* Log the message to syslogd */
164 if (device & L_LOG) { 164 if (device & L_LOG) {
165 /* don't out "\r" */ 165 /* don't out "\r" */
@@ -285,7 +285,7 @@ static void console_init(void)
285 * if TERM is set to linux (the default) */ 285 * if TERM is set to linux (the default) */
286 if (!s || strcmp(s, "linux") == 0) 286 if (!s || strcmp(s, "linux") == 0)
287 putenv((char*)"TERM=vt102"); 287 putenv((char*)"TERM=vt102");
288#if !ENABLE_SYSLOGD 288#if !ENABLE_FEATURE_INIT_SYSLOG
289 log_console = NULL; 289 log_console = NULL;
290#endif 290#endif
291 } else if (!s) 291 } else if (!s)