diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-05 19:55:30 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-05 19:55:30 +0000 |
| commit | ccd412da09d3d9ff54e14874c74c0a8dde6015b2 (patch) | |
| tree | ae9aad1d5ce1edd4ebc42d8e90b54f9b64c5192a /init | |
| parent | 1ccd96fd1f4aa038bb6e5c7419d04915c3586464 (diff) | |
decouple INIT and SYSLOGD (patch by Eric Spakman E.Spakman@inter.nl.net)
Diffstat (limited to 'init')
| -rw-r--r-- | init/Config.in | 5 | ||||
| -rw-r--r-- | init/init.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/init/Config.in b/init/Config.in index c0ad5263d..3987d8fee 100644 --- a/init/Config.in +++ b/init/Config.in @@ -38,6 +38,11 @@ config FEATURE_INIT_SCTTY behavour, but is often what you want in an embedded system where the console is only accessed during development or for maintenance. +config FEATURE_INIT_SYSLOG + bool "Enable init to write to syslog" + default n + depends on INIT + config FEATURE_EXTRA_QUIET bool "Be _extra_ quiet on boot" default y 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 @@ #include <sys/wait.h> #include <sys/reboot.h> -#if ENABLE_SYSLOGD +#if ENABLE_FEATURE_INIT_SYSLOG # include <sys/syslog.h> #endif @@ -84,7 +84,7 @@ struct init_action { /* Static variables */ static struct init_action *init_action_list = NULL; -#if !ENABLE_SYSLOGD +#if !ENABLE_FEATURE_INIT_SYSLOG static const char *log_console = VC_5; #endif #if !ENABLE_DEBUG_INIT @@ -144,7 +144,7 @@ static void message(int device, const char *fmt, ...) __attribute__ ((format(printf, 2, 3))); static void message(int device, const char *fmt, ...) { -#if !ENABLE_SYSLOGD +#if !ENABLE_FEATURE_INIT_SYSLOG static int log_fd = -1; #endif @@ -159,7 +159,7 @@ static void message(int device, const char *fmt, ...) msg[sizeof(msg) - 2] = '\0'; l = strlen(msg); -#if ENABLE_SYSLOGD +#if ENABLE_FEATURE_INIT_SYSLOG /* Log the message to syslogd */ if (device & L_LOG) { /* don't out "\r" */ @@ -285,7 +285,7 @@ static void console_init(void) * if TERM is set to linux (the default) */ if (!s || strcmp(s, "linux") == 0) putenv((char*)"TERM=vt102"); -#if !ENABLE_SYSLOGD +#if !ENABLE_FEATURE_INIT_SYSLOG log_console = NULL; #endif } else if (!s) |