diff options
author | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
commit | b604585914e032b28bef3e337a978e56a9069cda (patch) | |
tree | b2ee0a3fb38d10397c602d0fe215ea3bbbf334c0 /init | |
parent | 0eda07c7ff8cf1fc11bc1bda5383f884d7adf031 (diff) | |
parent | ba76b7a40b929878833731f76306b1c977cc8650 (diff) | |
download | busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.gz busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.bz2 busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'init')
-rw-r--r-- | init/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/init.c b/init/init.c index 724894698..b84bdccbc 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -520,7 +520,7 @@ static pid_t run(const struct init_action *a) | |||
520 | 520 | ||
521 | /* Log the process name and args */ | 521 | /* Log the process name and args */ |
522 | message(L_LOG, "starting pid %d, tty '%s': '%s'", | 522 | message(L_LOG, "starting pid %d, tty '%s': '%s'", |
523 | getpid(), a->terminal, a->command); | 523 | getpid(), a->terminal, a->command); |
524 | 524 | ||
525 | /* Now run it. The new program will take over this PID, | 525 | /* Now run it. The new program will take over this PID, |
526 | * so nothing further in init.c should be run. */ | 526 | * so nothing further in init.c should be run. */ |