5d38f5ba8
Eric Andersen
2005-09-12
Subject
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.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/applets.h +1 -1include/usage.h +3 -5procps/Config.in +1 -1procps/Makefile.in +1 -1sysdeps/linux/defconfig +1 -1
include/applets.h+1 -1
| @@ -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 | |
include/usage.h+3 -5
| @@ -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]..." | |
procps/Config.in+1 -1
| @@ -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 | |
procps/Makefile.in+1 -1
| @@ -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 | |
sysdeps/linux/defconfig+1 -1
| @@ -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 | |