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 /util-linux/switch_root.c | |
| 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 'util-linux/switch_root.c')
| -rw-r--r-- | util-linux/switch_root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index db6ae3542..a301b365b 100644 --- a/util-linux/switch_root.c +++ b/util-linux/switch_root.c | |||
| @@ -114,7 +114,7 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv) | |||
| 114 | } | 114 | } |
| 115 | xchroot("."); | 115 | xchroot("."); |
| 116 | // The chdir is needed to recalculate "." and ".." links | 116 | // The chdir is needed to recalculate "." and ".." links |
| 117 | xchdir("/"); | 117 | /*xchdir("/"); - done in xchroot */ |
| 118 | 118 | ||
| 119 | // If a new console specified, redirect stdin/stdout/stderr to it | 119 | // If a new console specified, redirect stdin/stdout/stderr to it |
| 120 | if (console) { | 120 | if (console) { |