diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:08:20 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:08:20 +1000 |
| commit | 6a6efd31038d7afe977e3059508ae863e65cbdf5 (patch) | |
| tree | 5cd69a751e893b83176751c80fcea7a7afeed1ae /runit | |
| parent | a6a2325ecf402054132daae169f71edb0fb849e3 (diff) | |
| parent | 29082231d0cb1a5b327de5d515b16f332d4dbdaf (diff) | |
| download | busybox-w32-6a6efd31038d7afe977e3059508ae863e65cbdf5.tar.gz busybox-w32-6a6efd31038d7afe977e3059508ae863e65cbdf5.tar.bz2 busybox-w32-6a6efd31038d7afe977e3059508ae863e65cbdf5.zip | |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/chpst.c | 3 | ||||
| -rw-r--r-- | runit/svlogd.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/runit/chpst.c b/runit/chpst.c index 1a68eb755..ad0811294 100644 --- a/runit/chpst.c +++ b/runit/chpst.c | |||
| @@ -382,6 +382,5 @@ int chpst_main(int argc UNUSED_PARAM, char **argv) | |||
| 382 | if (opt & OPT_2) | 382 | if (opt & OPT_2) |
| 383 | close(STDERR_FILENO); | 383 | close(STDERR_FILENO); |
| 384 | 384 | ||
| 385 | BB_EXECVP(argv[0], argv); | 385 | BB_EXECVP_or_die(argv); |
| 386 | bb_perror_msg_and_die("exec %s", argv[0]); | ||
| 387 | } | 386 | } |
diff --git a/runit/svlogd.c b/runit/svlogd.c index fc8b4abb9..9fe81b900 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c | |||
| @@ -354,7 +354,7 @@ static void processorstart(struct logdir *ld) | |||
| 354 | xmove_fd(fd, 5); | 354 | xmove_fd(fd, 5); |
| 355 | 355 | ||
| 356 | // getenv("SHELL")? | 356 | // getenv("SHELL")? |
| 357 | execl("/bin/sh", "/bin/sh" + 5, "-c", ld->processor, (char*) NULL); | 357 | execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", ld->processor, (char*) NULL); |
| 358 | bb_perror_msg_and_die(FATAL"can't %s processor %s", "run", ld->name); | 358 | bb_perror_msg_and_die(FATAL"can't %s processor %s", "run", ld->name); |
| 359 | } | 359 | } |
| 360 | ld->fnsave[26] = sv_ch; /* ...restore */ | 360 | ld->fnsave[26] = sv_ch; /* ...restore */ |