diff options
| author | Eric Andersen | 2005-09-12 21:42:48 +0000 |
|---|---|---|
| committer | Eric Andersen | 2005-09-12 21:42:48 +0000 |
| commit | 5d38f5ba898c276759f1e404455aad1f3073e730 (patch) | |
| tree | 1b646fcf1fccf02a0559c01eb115580082e22e71 | |
| parent | 2c6b41812febab045917c0be15ff8427191df0f4 (diff) | |
| download | busybox-5d38f5ba898c276759f1e404455aad1f3073e730.zip busybox-5d38f5ba898c276759f1e404455aad1f3073e730.tar.gz | |
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.
| -rw-r--r-- | include/applets.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 8 | ||||
| -rw-r--r-- | procps/Config.in | 2 | ||||
| -rw-r--r-- | procps/Makefile.in | 2 | ||||
| -rw-r--r-- | sysdeps/linux/defconfig | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/include/applets.h b/include/applets.h index a4e78af..61210bc 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 29d78bb..723b977 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 8d55797..7672582 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 b9eb117..5207b80 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 d62cfb9..617e86b 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 |