make bootup really quiet

6 files changed, 22 insertions, 20 deletions

diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS
index 08b34a9ca..3bb7b80ce 100755
--- a/package/base-files/src/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
@@ -5,7 +5,9 @@ if [ -f /proc/sys/kernel/printk ];then
 	echo 0 > /proc/sys/kernel/printk
 fi
 ln -s /proc/self/fd/2 /dev/stderr
-echo "System initialization ..."
+if [ $rcquiet -ne 1 ];then
+	echo "System initialization ..."
+fi
 
 # remount /dev with smaller size
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
diff --git a/package/base-files/src/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script
index 55a6655ab..7e9149e6e 100755
--- a/package/base-files/src/usr/share/udhcpc/default.script
+++ b/package/base-files/src/usr/share/udhcpc/default.script
@@ -15,23 +15,19 @@ case $1 in
 	ip addr add $ip/${mask:-24} brd + dev $interface
 
 	if [[ -n $router ]]; then
-		echo "deleting routers"
 		while ip route del default >&- 2>&-; do :; done
 
 		for i in $router; do
-			echo "adding router $i"
 			ip route add to default via $i
 		done
 	fi
 	echo -n >$RESOLV_CONF
 	${domain:+echo search $domain} >>$RESOLV_CONF
 	for i in $dns; do
-		echo "adding dns $i"
 		echo "nameserver $i" >>$RESOLV_CONF
 	done
 	# user rules
 	[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
 ;;
 esac
-
 exit $?
diff --git a/package/busybox/files/network b/package/busybox/files/network
index 4989fcbcb..03f88239f 100644
--- a/package/busybox/files/network
+++ b/package/busybox/files/network
@@ -9,11 +9,11 @@ autostart)
 	;;
 start)
 	[ -f /etc/network/interfaces ] || exit 1
-	ifup -a
+	ifup -a > /dev/null
 	;;
 autostop|stop)
 	[ -f /etc/network/interfaces ] || exit 1
-	ifdown -a
+	ifdown -a > /dev/null
 	;;
 restart)
 	sh $0 stop
diff --git a/target/Makefile b/target/Makefile
index 9f97d242a..1ac375b62 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -54,8 +54,12 @@ ifneq ($(ADK_PACKAGE_CRYPTINIT_ROOT),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_PACKAGE_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif
+ifeq ($(ADK_RUNTIME_QUIET_INIT),y)
+	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 rcquiet=1"#' \
+		${BUILD_DIR}/.kernelconfig.board
+endif
 ifeq ($(ADK_QUIET_KERNEL),y)
-	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 quiet"#' \
+	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 quiet loglevel=2"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif
 ifeq ($(ADK_KERNEL_DEBUG_WITH_KGDB),y)
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index e3f674d78..fdcc3fa6b 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -22,7 +22,7 @@ config ADK_RUNTIME_PASSWORD
 	  Predefine the root password enabled in the built image.
 
 config ADK_RUNTIME_START_SERVICES
-	prompt "start some services by default"
+	prompt "start services by default"
 	boolean
 	default n
 	help
@@ -47,8 +47,15 @@ config ADK_RUNTIME_TIMEZONE
 	help
 	  Predefine the timezone for the embedded system.
 
+config ADK_QUIET_KERNEL
+	prompt "make bootup quiet without messages from the kernel"
+	boolean
+	default n
+	help
+	  Make bootup quiet without messages from the kernel.
+
 choice
-prompt "Enable verbose bootup messages from initscripts"
+prompt "bootup messages from initscripts"
 default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA
 default ADK_RUNTIME_VERBOSE_INIT_SERIAL
 
@@ -65,7 +72,7 @@ config ADK_RUNTIME_QUIET_INIT
 endchoice
 
 choice
-prompt "Start getty or shell after bootup"
+prompt "start getty or shell after bootup"
 default ADK_RUNTIME_SHELL if ADK_PKG_TEST
 default ADK_RUNTIME_GETTY
 
@@ -129,7 +136,7 @@ config ADK_RUNTIME_KBD_LAYOUT
 	  Predefine the keyboard layout for the embedded system.
 
 choice
-prompt "Initial login shell for the root user"
+prompt "initial login shell for the root user"
 default ADK_ROOTSH_MKSH
 
 config ADK_ROOTSH_MKSH
@@ -169,7 +176,7 @@ config ADK_ROOTSH_ZSH
 endchoice
 
 choice
-prompt "System /bin/sh (POSIX script shell)"
+prompt "system /bin/sh (POSIX script shell)"
 default ADK_BINSH_MKSH
 
 config ADK_BINSH_MKSH
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 1d66ba986..b5bfea3e3 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -18,13 +18,6 @@ config ADK_KERNEL_KGDB_SERIAL_CONSOLE
 config ADK_KERNEL_FRAME_POINTER
 	boolean
 
-config ADK_QUIET_KERNEL
-	prompt "Make bootup quiet without messages from the kernel"
-	boolean
-	default n
-	help
-	  Make bootup quiet without messages from the kernel.
-
 config ADK_KERNEL_EARLY_PRINTK
 	boolean
 	default n