aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 15:24:13 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 15:24:13 +0100
commitf35ad3bd1287627fc6ca7cc9c1f48b186257dd87 (patch)
tree1cea61ffd900581a302bda2520371777b6b511ea
parent2b4c258e74d033b75b7f34bb384290eceb5da8a6 (diff)
downloadbusybox-f35ad3bd1287627fc6ca7cc9c1f48b186257dd87.tar.gz
init: rename FEATURE_EXTRA_QUIET -> FEATURE_INIT_QUIET
The former name had no INIT anywhere in its name, sounded generic Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--configs/TEST_nommu_defconfig2
-rw-r--r--configs/TEST_noprintf_defconfig2
-rw-r--r--configs/TEST_rh9_defconfig2
-rw-r--r--configs/android2_defconfig2
-rw-r--r--configs/android_502_defconfig2
-rw-r--r--configs/android_defconfig2
-rw-r--r--configs/android_ndk_defconfig2
-rw-r--r--configs/cygwin_defconfig2
-rw-r--r--configs/freebsd_defconfig2
-rw-r--r--init/init.c10
10 files changed, 13 insertions, 15 deletions
diff --git a/configs/TEST_nommu_defconfig b/configs/TEST_nommu_defconfig
index d9ec41cd0..d7a9cfe25 100644
--- a/configs/TEST_nommu_defconfig
+++ b/configs/TEST_nommu_defconfig
@@ -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
diff --git a/configs/TEST_noprintf_defconfig b/configs/TEST_noprintf_defconfig
index c7330ed5d..adb6b7036 100644
--- a/configs/TEST_noprintf_defconfig
+++ b/configs/TEST_noprintf_defconfig
@@ -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
diff --git a/configs/TEST_rh9_defconfig b/configs/TEST_rh9_defconfig
index 86e13cd53..0d72cdac9 100644
--- a/configs/TEST_rh9_defconfig
+++ b/configs/TEST_rh9_defconfig
@@ -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
diff --git a/configs/android2_defconfig b/configs/android2_defconfig
index 9338f66ac..866a87989 100644
--- a/configs/android2_defconfig
+++ b/configs/android2_defconfig
@@ -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"
diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig
index 316063440..8d8dd250f 100644
--- a/configs/android_502_defconfig
+++ b/configs/android_502_defconfig
@@ -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"
diff --git a/configs/android_defconfig b/configs/android_defconfig
index cd3490c4e..1eaab9eae 100644
--- a/configs/android_defconfig
+++ b/configs/android_defconfig
@@ -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"
diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig
index f2773be46..dc9d21ce5 100644
--- a/configs/android_ndk_defconfig
+++ b/configs/android_ndk_defconfig
@@ -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"
diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig
index 816f76e65..37e3e210f 100644
--- a/configs/cygwin_defconfig
+++ b/configs/cygwin_defconfig
@@ -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=""
diff --git a/configs/freebsd_defconfig b/configs/freebsd_defconfig
index d223b7230..90e0a8bda 100644
--- a/configs/freebsd_defconfig
+++ b/configs/freebsd_defconfig
@@ -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=""
diff --git a/init/init.c b/init/init.c
index 8db4ced58..833759341 100644
--- a/init/init.c
+++ b/init/init.c
@@ -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