aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-03-08 00:28:24 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2012-03-08 00:28:24 +0100
commit0687a5b496a05cbc06f3bcdc517a2e6cabc535df (patch)
tree55aedfacfddad2faafb75c4bee0d98122325df5c /procps
parent39c2cb2e93e2acc75a5eb6dd91d81f79c787acd5 (diff)
downloadbusybox-w32-0687a5b496a05cbc06f3bcdc517a2e6cabc535df.tar.gz
busybox-w32-0687a5b496a05cbc06f3bcdc517a2e6cabc535df.tar.bz2
busybox-w32-0687a5b496a05cbc06f3bcdc517a2e6cabc535df.zip
libbb: make xchroot do a chdir("/") after chroot
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps')
-rw-r--r--procps/sysctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/procps/sysctl.c b/procps/sysctl.c
index cb3b6a25a..5296d0f58 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -224,7 +224,7 @@ static int sysctl_handle_preload_file(const char *filename)
224 parser = config_open(filename); 224 parser = config_open(filename);
225 /* Must do it _after_ config_open(): */ 225 /* Must do it _after_ config_open(): */
226 xchdir("/proc/sys"); 226 xchdir("/proc/sys");
227 /* xchroot(".") - if you are paranoid */ 227 /* xchroot("/proc/sys") - if you are paranoid */
228 228
229//TODO: ';' is comment char too 229//TODO: ';' is comment char too
230//TODO: comment may be only at line start. "var=1 #abc" - "1 #abc" is the value 230//TODO: comment may be only at line start. "var=1 #abc" - "1 #abc" is the value
@@ -260,7 +260,7 @@ int sysctl_main(int argc UNUSED_PARAM, char **argv)
260 return sysctl_handle_preload_file(*argv ? *argv : "/etc/sysctl.conf"); 260 return sysctl_handle_preload_file(*argv ? *argv : "/etc/sysctl.conf");
261 } 261 }
262 xchdir("/proc/sys"); 262 xchdir("/proc/sys");
263 /* xchroot(".") - if you are paranoid */ 263 /* xchroot("/proc/sys") - if you are paranoid */
264 if (opt & (FLAG_TABLE_FORMAT | FLAG_SHOW_ALL)) { 264 if (opt & (FLAG_TABLE_FORMAT | FLAG_SHOW_ALL)) {
265 return sysctl_act_recursive("."); 265 return sysctl_act_recursive(".");
266 } 266 }