emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init: rename FEATURE_EXTRA_QUIET -> FEATURE_INIT_QUIET

Browse Source 
The former name had no INIT anywhere in its name, sounded generic

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-01-10 15:24:13 +01:00
parent 2b4c258e74
commit f35ad3bd12
10 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/TEST_nommu_defconfig
View File

@ -387,7 +387,7 @@ CONFIG_FEATURE_KILL_REMOVED=y
CONFIG_FEATURE_KILL_DELAY=1 CONFIG_FEATURE_KILL_DELAY=1
CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SCTTY=y
CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_INIT_SYSLOG=y
CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_FEATURE_INIT_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_FEATURE_INIT_COREDUMPS=y
CONFIG_LINUXRC=y CONFIG_LINUXRC=y
CONFIG_HALT=y CONFIG_HALT=y

2
configs/TEST_noprintf_defconfig
View File

@ -392,7 +392,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0
CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_KILL_DELAY=0
# CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SCTTY is not set
# CONFIG_FEATURE_INIT_SYSLOG 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_FEATURE_INIT_COREDUMPS is not set
# CONFIG_LINUXRC is not set # CONFIG_LINUXRC is not set
# CONFIG_HALT is not set # CONFIG_HALT is not set

2
configs/TEST_rh9_defconfig
View File

@ -404,7 +404,7 @@ CONFIG_FEATURE_USE_INITTAB=y
CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SCTTY=y
CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_INIT_SYSLOG=y
CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_FEATURE_INIT_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_FEATURE_INIT_COREDUMPS=y
CONFIG_LINUXRC=y CONFIG_LINUXRC=y
CONFIG_HALT=y CONFIG_HALT=y

2
configs/android2_defconfig
View File

@ -422,7 +422,7 @@ CONFIG_FEATURE_USE_INITTAB=y
CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SCTTY=y
CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_INIT_SYSLOG=y
CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_FEATURE_INIT_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_FEATURE_INIT_COREDUMPS=y
CONFIG_LINUXRC=y CONFIG_LINUXRC=y
CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_INIT_TERMINAL_TYPE="linux"

2
configs/android_502_defconfig
View File

@ -529,7 +529,7 @@ CONFIG_FEATURE_USE_INITTAB=y
CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SCTTY=y
CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_INIT_SYSLOG=y
CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_FEATURE_INIT_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_FEATURE_INIT_COREDUMPS=y
CONFIG_LINUXRC=y CONFIG_LINUXRC=y
CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_INIT_TERMINAL_TYPE="linux"

2
configs/android_defconfig
View File

@ -445,7 +445,7 @@ CONFIG_FEATURE_USE_INITTAB=y
CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SCTTY=y
CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_INIT_SYSLOG=y
CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_FEATURE_INIT_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_FEATURE_INIT_COREDUMPS=y
CONFIG_LINUXRC=y CONFIG_LINUXRC=y
CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_INIT_TERMINAL_TYPE="linux"

2
configs/android_ndk_defconfig
View File

@ -455,7 +455,7 @@ CONFIG_FEATURE_USE_INITTAB=y
CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SCTTY=y
CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_INIT_SYSLOG=y
CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_FEATURE_INIT_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_FEATURE_INIT_COREDUMPS=y
CONFIG_LINUXRC=y CONFIG_LINUXRC=y
CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_INIT_TERMINAL_TYPE="linux"

2
configs/cygwin_defconfig
View File

@ -422,7 +422,7 @@ CONFIG_TELINIT_PATH=""
CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_KILL_DELAY=0
# CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SCTTY is not set
# CONFIG_FEATURE_INIT_SYSLOG 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_FEATURE_INIT_COREDUMPS is not set
# CONFIG_LINUXRC is not set # CONFIG_LINUXRC is not set
CONFIG_INIT_TERMINAL_TYPE="" CONFIG_INIT_TERMINAL_TYPE=""

2
configs/freebsd_defconfig
View File

@ -419,7 +419,7 @@ CONFIG_TELINIT_PATH=""
CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_KILL_DELAY=0
# CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SCTTY is not set
# CONFIG_FEATURE_INIT_SYSLOG 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_FEATURE_INIT_COREDUMPS is not set
# CONFIG_LINUXRC is not set # CONFIG_LINUXRC is not set
CONFIG_INIT_TERMINAL_TYPE="" CONFIG_INIT_TERMINAL_TYPE=""

10
init/init.c
View File

@ -17,7 +17,7 @@
//config: init is the first program run when the system boots. //config: init is the first program run when the system boots.
//config: //config:
//config:config LINUXRC //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: default y
//config: select FEATURE_SYSLOG //config: select FEATURE_SYSLOG
//config: help //config: help
@ -74,12 +74,10 @@
//config: default y //config: default y
//config: depends on INIT || LINUXRC //config: depends on INIT || LINUXRC
//config: //config:
//config:config FEATURE_EXTRA_QUIET //config:config FEATURE_INIT_QUIET
//config: bool "Be _extra_ quiet on boot" //config: bool "Be quiet on boot (no 'init started:' message)"
//config: default y //config: default y
//config: depends on INIT || LINUXRC //config: depends on INIT || LINUXRC
//config: help
//config: Prevent init from logging some messages to the console during boot.
//config: //config:
//config:config FEATURE_INIT_COREDUMPS //config:config FEATURE_INIT_COREDUMPS
//config: bool "Support dumping core for child processes (debugging only)" //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]) if (argv[1])
xsetenv("RUNLEVEL", argv[1]); xsetenv("RUNLEVEL", argv[1]);
#if !ENABLE_FEATURE_EXTRA_QUIET #if !ENABLE_FEATURE_INIT_QUIET
/* Hello world */ /* Hello world */
message(L_CONSOLE | L_LOG, "init started: %s", bb_banner); message(L_CONSOLE | L_LOG, "init started: %s", bb_banner);
#endif #endif