diff options
| author | Eric Andersen <andersen@codepoet.org> | 2005-09-12 21:42:48 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2005-09-12 21:42:48 +0000 |
| commit | 5d38f5ba898c276759f1e404455aad1f3073e730 (patch) | |
| tree | 1b646fcf1fccf02a0559c01eb115580082e22e71 /include | |
| parent | 2c6b41812febab045917c0be15ff8427191df0f4 (diff) | |
| download | 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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 8 |
2 files changed, 4 insertions, 6 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]..." |