# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1338594180 -7200
# Node ID 175982c0484c360c817b8172d0c751d157299dd3
# Parent  38802b3f292369eae0a403ebb05797d6bdc6811d
Use tee to log boot and hide loadkey output

diff -r 38802b3f2923 -r 175982c0484c etc/init.d/rcS
--- a/etc/init.d/rcS	Sat Jun 02 00:22:08 2012 +0200
+++ b/etc/init.d/rcS	Sat Jun 02 01:43:00 2012 +0200
@@ -20,12 +20,11 @@
 
 colorize 34 "Processing: /etc/init.d/rcS..."
 
-# Mount /proc.
+# Mount /proc
 echo -n "Mounting proc filesystem on /proc"
 mount proc && status
 
-# Mount /run as tmpfs to avoid pidfile and other runtime data behing
-# writting to disk.
+# Mount /run as tmpfs runtime data are not written to disk
 echo -n "Mounting tmpfs filesystem on: /run"
 mount -t tmpfs tmpfs /run
 status
@@ -45,7 +44,7 @@
 	echo "" > /proc/sys/kernel/hotplug
 fi
 
-# Busybox mdev is an udev alternative tu Udev.
+# Busybox mdev is an udev alternative
 if [ "$UDEV" == "mdev" ]; then
 	echo -n "Executing mdev -s to populate /dev..."
 	mdev -s && echo "mdev" > /proc/sys/kernel/hotplug
@@ -111,8 +110,8 @@
 
 # Handle kernel cmdline parameter modprobe=<module_list>
 if [ "$MODPROBE" ]; then
-	MODULES=$(sed -e 's/.* modprobe=\([^ ]*\).*/\1/' -e 's/,/\n/g' < /proc/cmdline)
-	for i in $MODULES; do
+	mods=$(sed -e 's/.* modprobe=\([^ ]*\).*/\1/' -e 's/,/\n/g' < /proc/cmdline)
+	for i in $mods; do
 		echo -n "Loading kernel module: $i"
 		modprobe $i
 		status
@@ -146,7 +145,7 @@
 
 # Mount /proc/bus/usb
 if [ -d /proc/bus/usb ]; then
-	echo -n "Mounting /proc/bus/usb filesystem..."
+	echo -n "Mounting usbfs filesystem on: /proc/bus/usb"
 	mount -t usbfs usbfs /proc/bus/usb
 	status
 fi
@@ -211,19 +210,17 @@
 
 *)
 	# --> readonly --> readwrite
-	#if [ ! -s /tmp/boot.log ]; then
-		#mount -t tmpfs tmpfs /tmp
-		#mount -t devpts devpts /dev/pts
-	#fi
-	#script -aqc '/etc/init.d/rcS readonly' /tmp/boot.log
-	/etc/init.d/rcS readonly
-	#umount /tmp
+	if [ ! -s /tmp/boot.log ]; then
+		mount -t tmpfs tmpfs /tmp
+	fi
+	/etc/init.d/rcS readonly | tee /tmp/boot.log
 	# Lograde boot.log
 	last=.9
 	for i in .8 .7 .6 .5 .4 .3 .2 .1 .0 '' ; do
-		mv -f /var/log/boot.log$i /var/log/boot.log$last 2>/dev/null
+		mv -f /var/log/boot.log${i} /var/log/boot.log${last} 2>/dev/null
 		last=$i
 	done
-	#mv -f /tmp/boot.log /var/log/boot.log
-	script -aqc '/etc/init.d/rcS readwrite' /var/log/boot.log ;;
+	mv -f /tmp/boot.log /var/log/boot.log
+	umount /tmp
+	/etc/init.d/rcS readwrite | tee -a /var/log/boot.log ;;
 esac
diff -r 38802b3f2923 -r 175982c0484c etc/init.d/system.sh
--- a/etc/init.d/system.sh	Sat Jun 02 00:22:08 2012 +0200
+++ b/etc/init.d/system.sh	Sat Jun 02 01:43:00 2012 +0200
@@ -70,26 +70,27 @@
 	echo "Unable to configure sound card."
 fi
 
-# Locale config.
-echo "Checking if /etc/locale.conf exists... "
+# Locale config
 if [ ! -s "/etc/locale.conf" ]; then
 	echo "Setting system locale to: POSIX (English)"
 	echo -e "LANG=POSIX\nLC_ALL=POSIX" > /etc/locale.conf
 fi
 . /etc/locale.conf
-echo -n "Locale configuration: $LANG"
-export LC_ALL
+echo -n "Setting system locale: $LANG"
+export LC_ALL=$LANG
 . /lib/libtaz.sh && status
 
-# Keymap config. Default to us in live mode if kmap= was not used.
+# Keymap config: Default to us in live mode if kmap= was not used.
 if [ ! -s "/etc/keymap.conf" ]; then
+	echo "Setting system keymap to: us (USA)"
 	echo "us" > /etc/keymap.conf
 fi
 kmap=$(cat /etc/keymap.conf)
-echo "Keymap configuration: $kmap"
-/sbin/tazkeymap $kmap
+echo -n "Loading console keymap: $kmap"
+/sbin/tazkeymap $kmap >/dev/null
+status
 
-# Timezone config. Set timezone using the keymap config for fr, be, fr_CH
+# Timezone config: Set timezone using the keymap config for fr, be, fr_CH
 # and ca with Montreal.
 if [ ! -s "/etc/TZ" ]; then
 	case "$kmap" in