mirror of
https://github.com/sheumann/hush.git
synced 2024-08-20 04:28:57 +00:00
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.
This commit is contained in:
parent
2c6b41812f
commit
5d38f5ba89
@ -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
|
||||
|
@ -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]..."
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user