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.

diff --git a/include/applets.h b/include/applets.h
index a4e78af575fd8592998e0fef55a0c6e50fd627b4..61210bcc36095b255b4d7be616f05f4c7fdabf18 100644 (file)
--- 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 29d78bbbbfbd7c23425e6fc8417272e80e80dcc3..723b97759c0509dba2f9e88ef7cd76b8dbfb373b 100644 (file)
--- 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 8d557972cc8d302e52bd08698039eb633ea55c29..7672582ddb82f153316ba153d63279e62eac0598 100644 (file)
--- 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 b9eb117fd8968a71af159262116cf230e3cd1e76..5207b801b46bf3788a816f774000d0ca800de16d 100644 (file)
--- 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 d62cfb90332bc4d0b0d1a2003b3e54999a614baf..617e86ba726713d0350e2dea58da4a9c345209e3 100644 (file)
--- 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