emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init: dont send "Sent SIGTERM to all" msg to syslog: we just TERMed it!

Browse Source 
While at it, explain FEATURE_INIT_SYSLOG

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-04-07 19:13:09 +02:00
parent 7121bb8023
commit 42776708f2
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
init/init.c
View File

@ -73,6 +73,10 @@
//config: bool "Enable init to write to syslog" //config: bool "Enable init to write to syslog"
//config: default y //config: default y
//config: depends on INIT || LINUXRC //config: depends on INIT || LINUXRC
//config: help
//config: If selected, some init messages are sent to syslog.
//config: Otherwise, they are sent to VT #5 if linux virtual tty is detected
//config: (if not, no separate logging is done).
//config: //config:
//config:config FEATURE_INIT_QUIET //config:config FEATURE_INIT_QUIET
//config: bool "Be quiet on boot (no 'init started:' message)" //config: bool "Be quiet on boot (no 'init started:' message)"
@ -212,7 +216,9 @@ struct init_action {
static struct init_action *init_action_list = NULL; static struct init_action *init_action_list = NULL;
#if !ENABLE_FEATURE_INIT_SYSLOG
static const char *log_console = VC_5; static const char *log_console = VC_5;
#endif
enum { enum {
L_LOG = 0x1, L_LOG = 0x1,
@ -251,17 +257,16 @@ static void message(int where, const char *fmt, ...)
msg[l++] = '\n'; msg[l++] = '\n';
msg[l] = '\0'; msg[l] = '\0';
#else #else
{ msg[l++] = '\n';
static int log_fd = -1; msg[l] = '\0';
if (where & L_LOG) {
msg[l++] = '\n';
msg[l] = '\0';
/* Take full control of the log tty, and never close it. /* Take full control of the log tty, and never close it.
* It's mine, all mine! Muhahahaha! */ * It's mine, all mine! Muhahahaha! */
static int log_fd = -1;
if (log_fd < 0) { if (log_fd < 0) {
if (!log_console) { log_fd = STDERR_FILENO;
log_fd = STDERR_FILENO; if (log_console) {
} else {
log_fd = device_open(log_console, O_WRONLY | O_NONBLOCK | O_NOCTTY); log_fd = device_open(log_console, O_WRONLY | O_NONBLOCK | O_NOCTTY);
if (log_fd < 0) { if (log_fd < 0) {
bb_error_msg("can't log to %s", log_console); bb_error_msg("can't log to %s", log_console);
@ -271,11 +276,9 @@ static void message(int where, const char *fmt, ...)
} }
} }
} }
if (where & L_LOG) { full_write(log_fd, msg, l);
full_write(log_fd, msg, l); if (log_fd == STDERR_FILENO)
if (log_fd == STDERR_FILENO) return; /* don't print dup messages */
return; /* don't print dup messages */
}
} }
#endif #endif
@ -325,8 +328,9 @@ static void console_init(void)
* if TERM is set to linux (the default) */ * if TERM is set to linux (the default) */
if (!s || strcmp(s, "linux") == 0) if (!s || strcmp(s, "linux") == 0)
putenv((char*)"TERM=vt102"); putenv((char*)"TERM=vt102");
if (!ENABLE_FEATURE_INIT_SYSLOG) # if !ENABLE_FEATURE_INIT_SYSLOG
log_console = NULL; log_console = NULL;
# endif
} else } else
#endif #endif
if (!s) if (!s)
@ -541,8 +545,8 @@ static pid_t run(const struct init_action *a)
} }
/* Log the process name and args */ /* Log the process name and args */
message(L_LOG, "starting pid %d, tty '%s': '%s'", message(L_LOG, "starting pid %u, tty '%s': '%s'",
getpid(), a->terminal, a->command); (int)getpid(), a->terminal, a->command);
/* Now run it. The new program will take over this PID, /* Now run it. The new program will take over this PID,
* so nothing further in init.c should be run. */ * so nothing further in init.c should be run. */
@ -757,7 +761,7 @@ static void run_shutdown_and_kill_processes(void)
/* Send signals to every process _except_ pid 1 */ /* Send signals to every process _except_ pid 1 */
kill(-1, SIGTERM); kill(-1, SIGTERM);
message(L_CONSOLE | L_LOG, "Sent SIG%s to all processes", "TERM"); message(L_CONSOLE, "Sent SIG%s to all processes", "TERM");
sync(); sync();
sleep(1); sleep(1);