diff options
author | Ron Yorston <rmy@pobox.com> | 2015-03-14 20:33:00 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-03-14 20:33:00 +0000 |
commit | a4f58436b78fe59e57620c6e0301f213ee25f273 (patch) | |
tree | 8355f724926e605280af2d6f2b1ccc6b1bd02dee /init | |
parent | ba0c36cfcf84efbac6f89e27238e04bb57e9cd45 (diff) | |
parent | 49acc1a7618a28d34381cbb7661d7c981fcb238f (diff) | |
download | busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.tar.gz busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.tar.bz2 busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.zip |
Merge branch 'busybox' into merge
Conflicts:
coreutils/od_bloaty.c
libbb/lineedit.c
Diffstat (limited to 'init')
-rw-r--r-- | init/init.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/init/init.c b/init/init.c index d99d68ce4..b2fe85635 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -538,11 +538,7 @@ static struct init_action *mark_terminated(pid_t pid) | |||
538 | struct init_action *a; | 538 | struct init_action *a; |
539 | 539 | ||
540 | if (pid > 0) { | 540 | if (pid > 0) { |
541 | update_utmp(pid, DEAD_PROCESS, | 541 | update_utmp_DEAD_PROCESS(pid); |
542 | /*tty_name:*/ NULL, | ||
543 | /*username:*/ NULL, | ||
544 | /*hostname:*/ NULL | ||
545 | ); | ||
546 | for (a = init_action_list; a; a = a->next) { | 542 | for (a = init_action_list; a; a = a->next) { |
547 | if (a->pid == pid) { | 543 | if (a->pid == pid) { |
548 | a->pid = 0; | 544 | a->pid = 0; |