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

init: don't srop unterminated processes' entries during inittab reload

Browse Source 
This feature was removed in 72c99af

It is useful when process is removed from inittab and later added
back, but never terminated. It prevents init from spawning duplicate.

function                                             old     new   delta
check_delayed_sigs                                   176     182      +6

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Paulius Zaleckas 2013-08-16 12:01:58 +02:00 committed by Denys Vlasenko
parent d2e07bc16c
commit 9f07af6156
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
init/init.c
View File

@ -638,7 +638,7 @@ static void new_init_action(uint8_t action_type, const char *command, const char
a->action_type = action_type; a->action_type = action_type;
strcpy(a->command, command); strcpy(a->command, command);
safe_strncpy(a->terminal, cons, sizeof(a->terminal)); safe_strncpy(a->terminal, cons, sizeof(a->terminal));
dbg_message(L_LOG | L_CONSOLE, "command='%s' action=%d tty='%s'\n", dbg_message(L_LOG | L_CONSOLE, "command='%s' action=%x tty='%s'\n",
a->command, a->action_type, a->terminal); a->command, a->action_type, a->terminal);
} }
@ -934,10 +934,17 @@ static void reload_inittab(void)
/* Remove stale entries and SYSINIT entries. /* Remove stale entries and SYSINIT entries.
* We never rerun SYSINIT entries anyway, * We never rerun SYSINIT entries anyway,
* removing them too saves a few bytes */ * removing them too saves a few bytes
*/
nextp = &init_action_list; nextp = &init_action_list;
while ((a = *nextp) != NULL) { while ((a = *nextp) != NULL) {
if ((a->action_type & ~SYSINIT) == 0) { /*
* Why pid == 0 check?
* Process can be removed from inittab and added *later*.
* If we delete its entry but process still runs,
* duplicate is spawned when the entry is re-added.
*/
if ((a->action_type & ~SYSINIT) == 0 && a->pid == 0) {
*nextp = a->next; *nextp = a->next;
free(a); free(a);
} else { } else {