diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 12:12:03 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 12:12:03 +0000 |
| commit | b0f54743e36af163ae2530c381c485bb29df13dc (patch) | |
| tree | cda4cfeaae6e47fe4f14c1b566092be4da9affc4 /runit | |
| parent | 40514a0309939f2446f0d4ed9600cad5de396e7f (diff) | |
| parent | ba88826c66411affc1da3614742b454654f7298a (diff) | |
| download | busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.tar.gz busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.tar.bz2 busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.zip | |
Merge branch 'busybox' into merge
Conflicts:
Makefile.flags
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/chpst.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runit/chpst.c b/runit/chpst.c index 9b8c99bdd..ac296babf 100644 --- a/runit/chpst.c +++ b/runit/chpst.c | |||
| @@ -417,8 +417,7 @@ int chpst_main(int argc UNUSED_PARAM, char **argv) | |||
| 417 | } | 417 | } |
| 418 | 418 | ||
| 419 | if (opt & OPT_root) { | 419 | if (opt & OPT_root) { |
| 420 | xchdir(root); | 420 | xchroot(root); |
| 421 | xchroot("."); | ||
| 422 | } | 421 | } |
| 423 | 422 | ||
| 424 | if (opt & OPT_u) { | 423 | if (opt & OPT_u) { |