f35ad3bd1
Denys Vlasenko
2017-01-10
Subject
init: rename FEATURE_EXTRA_QUIET -> FEATURE_INIT_QUIET
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
configs/TEST_nommu_defconfig +1 -1configs/TEST_noprintf_defconfig +1 -1configs/TEST_rh9_defconfig +1 -1configs/android2_defconfig +1 -1configs/android_502_defconfig +1 -1configs/android_defconfig +1 -1configs/android_ndk_defconfig +1 -1configs/cygwin_defconfig +1 -1configs/freebsd_defconfig +1 -1init/init.c +4 -6
configs/TEST_nommu_defconfig+1 -1
| @@ -387,7 +387,7 @@ CONFIG_FEATURE_KILL_REMOVED=y | |
| CONFIG_FEATURE_KILL_DELAY=1 | |
| CONFIG_FEATURE_INIT_SCTTY=y | |
| CONFIG_FEATURE_INIT_SYSLOG=y | |
| - | CONFIG_FEATURE_EXTRA_QUIET=y |
| + | CONFIG_FEATURE_INIT_QUIET=y |
| CONFIG_FEATURE_INIT_COREDUMPS=y | |
| CONFIG_LINUXRC=y | |
| CONFIG_HALT=y | |
configs/TEST_noprintf_defconfig+1 -1
| @@ -392,7 +392,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 | |
| CONFIG_FEATURE_KILL_DELAY=0 | |
| # CONFIG_FEATURE_INIT_SCTTY is not set | |
| # CONFIG_FEATURE_INIT_SYSLOG is not set | |
| - | # CONFIG_FEATURE_EXTRA_QUIET is not set |
| + | # CONFIG_FEATURE_INIT_QUIET is not set |
| # CONFIG_FEATURE_INIT_COREDUMPS is not set | |
| # CONFIG_LINUXRC is not set | |
| # CONFIG_HALT is not set | |
configs/TEST_rh9_defconfig+1 -1
| @@ -404,7 +404,7 @@ CONFIG_FEATURE_USE_INITTAB=y | |
| CONFIG_FEATURE_KILL_DELAY=0 | |
| CONFIG_FEATURE_INIT_SCTTY=y | |
| CONFIG_FEATURE_INIT_SYSLOG=y | |
| - | CONFIG_FEATURE_EXTRA_QUIET=y |
| + | CONFIG_FEATURE_INIT_QUIET=y |
| CONFIG_FEATURE_INIT_COREDUMPS=y | |
| CONFIG_LINUXRC=y | |
| CONFIG_HALT=y | |
configs/android2_defconfig+1 -1
| @@ -422,7 +422,7 @@ CONFIG_FEATURE_USE_INITTAB=y | |
| CONFIG_FEATURE_KILL_DELAY=0 | |
| CONFIG_FEATURE_INIT_SCTTY=y | |
| CONFIG_FEATURE_INIT_SYSLOG=y | |
| - | CONFIG_FEATURE_EXTRA_QUIET=y |
| + | CONFIG_FEATURE_INIT_QUIET=y |
| CONFIG_FEATURE_INIT_COREDUMPS=y | |
| CONFIG_LINUXRC=y | |
| CONFIG_INIT_TERMINAL_TYPE="linux" | |
configs/android_502_defconfig+1 -1
| @@ -529,7 +529,7 @@ CONFIG_FEATURE_USE_INITTAB=y | |
| CONFIG_FEATURE_KILL_DELAY=0 | |
| CONFIG_FEATURE_INIT_SCTTY=y | |
| CONFIG_FEATURE_INIT_SYSLOG=y | |
| - | CONFIG_FEATURE_EXTRA_QUIET=y |
| + | CONFIG_FEATURE_INIT_QUIET=y |
| CONFIG_FEATURE_INIT_COREDUMPS=y | |
| CONFIG_LINUXRC=y | |
| CONFIG_INIT_TERMINAL_TYPE="linux" | |
configs/android_defconfig+1 -1
| @@ -445,7 +445,7 @@ CONFIG_FEATURE_USE_INITTAB=y | |
| CONFIG_FEATURE_KILL_DELAY=0 | |
| CONFIG_FEATURE_INIT_SCTTY=y | |
| CONFIG_FEATURE_INIT_SYSLOG=y | |
| - | CONFIG_FEATURE_EXTRA_QUIET=y |
| + | CONFIG_FEATURE_INIT_QUIET=y |
| CONFIG_FEATURE_INIT_COREDUMPS=y | |
| CONFIG_LINUXRC=y | |
| CONFIG_INIT_TERMINAL_TYPE="linux" | |
configs/android_ndk_defconfig+1 -1
| @@ -455,7 +455,7 @@ CONFIG_FEATURE_USE_INITTAB=y | |
| CONFIG_FEATURE_KILL_DELAY=0 | |
| CONFIG_FEATURE_INIT_SCTTY=y | |
| CONFIG_FEATURE_INIT_SYSLOG=y | |
| - | CONFIG_FEATURE_EXTRA_QUIET=y |
| + | CONFIG_FEATURE_INIT_QUIET=y |
| CONFIG_FEATURE_INIT_COREDUMPS=y | |
| CONFIG_LINUXRC=y | |
| CONFIG_INIT_TERMINAL_TYPE="linux" | |
configs/cygwin_defconfig+1 -1
| @@ -422,7 +422,7 @@ CONFIG_TELINIT_PATH="" | |
| CONFIG_FEATURE_KILL_DELAY=0 | |
| # CONFIG_FEATURE_INIT_SCTTY is not set | |
| # CONFIG_FEATURE_INIT_SYSLOG is not set | |
| - | # CONFIG_FEATURE_EXTRA_QUIET is not set |
| + | # CONFIG_FEATURE_INIT_QUIET is not set |
| # CONFIG_FEATURE_INIT_COREDUMPS is not set | |
| # CONFIG_LINUXRC is not set | |
| CONFIG_INIT_TERMINAL_TYPE="" | |
configs/freebsd_defconfig+1 -1
| @@ -419,7 +419,7 @@ CONFIG_TELINIT_PATH="" | |
| CONFIG_FEATURE_KILL_DELAY=0 | |
| # CONFIG_FEATURE_INIT_SCTTY is not set | |
| # CONFIG_FEATURE_INIT_SYSLOG is not set | |
| - | # CONFIG_FEATURE_EXTRA_QUIET is not set |
| + | # CONFIG_FEATURE_INIT_QUIET is not set |
| # CONFIG_FEATURE_INIT_COREDUMPS is not set | |
| # CONFIG_LINUXRC is not set | |
| CONFIG_INIT_TERMINAL_TYPE="" | |
init/init.c+4 -6
| @@ -17,7 +17,7 @@ | |
| //config: init is the first program run when the system boots. | |
| //config: | |
| //config:config LINUXRC | |
| - | //config: bool "Support running init from within an initrd (not initramfs)" |
| + | //config: bool "linuxrc: support running init from initrd (not initramfs)" |
| //config: default y | |
| //config: select FEATURE_SYSLOG | |
| //config: help | |
| @@ -74,12 +74,10 @@ | |
| //config: default y | |
| //config: depends on INIT || LINUXRC | |
| //config: | |
| - | //config:config FEATURE_EXTRA_QUIET |
| - | //config: bool "Be _extra_ quiet on boot" |
| + | //config:config FEATURE_INIT_QUIET |
| + | //config: bool "Be quiet on boot (no 'init started:' message)" |
| //config: default y | |
| //config: depends on INIT || LINUXRC | |
| - | //config: help |
| - | //config: Prevent init from logging some messages to the console during boot. |
| //config: | |
| //config:config FEATURE_INIT_COREDUMPS | |
| //config: bool "Support dumping core for child processes (debugging only)" | |
| @@ -1098,7 +1096,7 @@ int init_main(int argc UNUSED_PARAM, char **argv) | |
| if (argv[1]) | |
| xsetenv("RUNLEVEL", argv[1]); | |
| - | #if !ENABLE_FEATURE_EXTRA_QUIET |
| + | #if !ENABLE_FEATURE_INIT_QUIET |
| /* Hello world */ | |
| message(L_CONSOLE | L_LOG, "init started: %s", bb_banner); | |
| #endif | |