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.


git-svn-id: svn://busybox.net/trunk/busybox@11433 69ca8d6d-28ef-0310-b511-8ec308f3f277

5 files changed, 7 insertions, 9 deletions

diff --git a/include/applets.h b/include/applets.h
index a4e78af57..61210bcc3 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -612,7 +612,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
diff --git a/include/usage.h b/include/usage.h
index 29d78bbbb..723b97759 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -2654,24 +2654,22 @@
 #  define USAGE_IPC_LOG(a)
 #endif
 
-#ifdef CONFIG_SYSCTL
 #define sysctl_trivial_usage \
         "[OPTIONS]... [VALUE]..."
-#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]..."
diff --git a/procps/Config.in b/procps/Config.in
index 8d557972c..7672582dd 100644
--- a/procps/Config.in
+++ b/procps/Config.in
@@ -72,7 +72,7 @@ config CONFIG_UPTIME
           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
diff --git a/procps/Makefile.in b/procps/Makefile.in
index b9eb117fd..5207b801b 100644
--- a/procps/Makefile.in
+++ b/procps/Makefile.in
@@ -29,7 +29,7 @@ PROCPS-$(CONFIG_KILL)		+= kill.o
 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
 
diff --git a/sysdeps/linux/defconfig b/sysdeps/linux/defconfig
index d62cfb903..617e86ba7 100644
--- a/sysdeps/linux/defconfig
+++ b/sysdeps/linux/defconfig
@@ -333,7 +333,7 @@ CONFIG_PS=y
 # 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