svn commit: branches/busybox_1_00_stable/busybox: include procps sysdeps/linux
andersen at busybox.net
andersen at busybox.net
Mon Sep 12 21:26:50 UTC 2005
Author: andersen
Date: 2005-09-12 14:26:42 -0700 (Mon, 12 Sep 2005)
New Revision: 11431
Log:
sysctl was seriously broken. And since in some cases 'CONFIG_SYSCTL'
could be included into application space via the kernel config option
of the same name, nasty compilation problems could result.
Modified:
branches/busybox_1_00_stable/busybox/include/applets.h
branches/busybox_1_00_stable/busybox/include/usage.h
branches/busybox_1_00_stable/busybox/procps/Config.in
branches/busybox_1_00_stable/busybox/procps/Makefile.in
branches/busybox_1_00_stable/busybox/sysdeps/linux/defconfig
Changeset:
Modified: branches/busybox_1_00_stable/busybox/include/applets.h
===================================================================
--- branches/busybox_1_00_stable/busybox/include/applets.h 2005-09-12 19:17:03 UTC (rev 11430)
+++ branches/busybox_1_00_stable/busybox/include/applets.h 2005-09-12 21:26:42 UTC (rev 11431)
@@ -547,7 +547,7 @@
#ifdef CONFIG_SYNC
APPLET(sync, sync_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif
-#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_BB_SYSCTL
APPLET(sysctl, sysctl_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
#endif
#ifdef CONFIG_SYSLOGD
Modified: branches/busybox_1_00_stable/busybox/include/usage.h
===================================================================
--- branches/busybox_1_00_stable/busybox/include/usage.h 2005-09-12 19:17:03 UTC (rev 11430)
+++ branches/busybox_1_00_stable/busybox/include/usage.h 2005-09-12 21:26:42 UTC (rev 11431)
@@ -2302,24 +2302,22 @@
#define USAGE_IPC_LOG(a)
#endif
-#ifdef CONFIG_SYSCTL
#define sysctl_trivial_usage \
"[OPTIONS]... [VALUE]...\n"
-#define sysctl_full_usage
- "sysctl - configure kernel parameters at runtime\n\n" \
+#define sysctl_full_usage \
+ "configure kernel parameters at runtime\n\n" \
"Options:\n" \
"\t-n\tUse this option to disable printing of the key name when printing values.\n" \
"\t-w\tUse this option when you want to change a sysctl setting.\n" \
"\t-p\tLoad in sysctl settings from the file specified or /etc/sysctl.conf if none given.\n" \
"\t-a\tDisplay all values currently available.\n" \
"\t-A\tDisplay all values currently available in table form."
-#define sysctl_example_usage
+#define sysctl_example_usage \
"sysctl [-n] variable ...\n" \
"sysctl [-n] -w variable=value ...\n" \
"sysctl [-n] -a\n" \
"sysctl [-n] -p <file>\t(default /etc/sysctl.conf)\n" \
"sysctl [-n] -A\n"
-#endif
#define syslogd_trivial_usage \
"[OPTION]..."
Modified: branches/busybox_1_00_stable/busybox/procps/Config.in
===================================================================
--- branches/busybox_1_00_stable/busybox/procps/Config.in 2005-09-12 19:17:03 UTC (rev 11430)
+++ branches/busybox_1_00_stable/busybox/procps/Config.in 2005-09-12 21:26:42 UTC (rev 11431)
@@ -72,7 +72,7 @@
the system has been running, how many users are currently logged
on, and the system load averages for the past 1, 5, and 15 minutes.
-config CONFIG_SYSCTL
+config CONFIG_BB_SYSCTL
bool "sysctl"
default n
help
Modified: branches/busybox_1_00_stable/busybox/procps/Makefile.in
===================================================================
--- branches/busybox_1_00_stable/busybox/procps/Makefile.in 2005-09-12 19:17:03 UTC (rev 11430)
+++ branches/busybox_1_00_stable/busybox/procps/Makefile.in 2005-09-12 21:26:42 UTC (rev 11431)
@@ -29,7 +29,7 @@
PROCPS-$(CONFIG_PIDOF) += pidof.o
PROCPS-$(CONFIG_PS) += ps.o
PROCPS-$(CONFIG_RENICE) += renice.o
-PROCPS-$(CONFIG_SYSCTL) += sysctl.o
+PROCPS-$(CONFIG_BB_SYSCTL) += sysctl.o
PROCPS-$(CONFIG_TOP) += top.o
PROCPS-$(CONFIG_UPTIME) += uptime.o
Modified: branches/busybox_1_00_stable/busybox/sysdeps/linux/defconfig
===================================================================
--- branches/busybox_1_00_stable/busybox/sysdeps/linux/defconfig 2005-09-12 19:17:03 UTC (rev 11430)
+++ branches/busybox_1_00_stable/busybox/sysdeps/linux/defconfig 2005-09-12 21:26:42 UTC (rev 11431)
@@ -333,7 +333,7 @@
# CONFIG_RENICE is not set
# CONFIG_TOP is not set
CONFIG_UPTIME=y
-# CONFIG_SYSCTL is not set
+# CONFIG_BB_SYSCTL is not set
#
# Another Bourne-like Shell
More information about the busybox-cvs
mailing list