# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1448621281 -7200
# Node ID 29ec74a6d3592161393a262d70d2dfde5a42ec1d
# Parent  cdb1a0f6966a70020e8986f675191901c664204e
Use 'action' before 'status' in pair

diff -r cdb1a0f6966a -r 29ec74a6d359 etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Sat Nov 07 02:33:50 2015 +0200
+++ b/etc/init.d/bootopts.sh	Fri Nov 27 12:48:01 2015 +0200
@@ -41,7 +41,7 @@
 		cp /etc/slitaz/applications.conf /etc/skel/.config/slitaz
 	fi
 
-	echo -n "Configuring user and group: $USER..."
+	action 'Configuring user and group: $USER...'
 	adduser -D -s /bin/sh -g 'SliTaz User' -G users -h /home/$USER $USER
 	passwd -d $USER >/dev/null
 	for group in audio cdrom video tty plugdev disk; do
@@ -73,13 +73,13 @@
 		kmap=*)
 			# Check for a specified keymap (kmap=*).
 			KEYMAP=${opt#kmap=}
-			echo -n "Setting system keymap to: $KEYMAP..."
+			action 'Setting system keymap to: $KEYMAP...'
 			echo "$KEYMAP" > /etc/keymap.conf
 			status ;;
 		font=*)
 			# Check for a specified console font (font=*).
 			FONT=${opt#font=}
-			echo -n "Setting console font to: $FONT..."
+			action 'Setting console font to: $FONT...'
 			for con in 1 2 3 4 5 6; do
 				setfont $FONT -C /dev/tty$con
 			done
@@ -182,7 +182,7 @@
 			[ -z "$PKGDEV" -a -L /dev/cdrom ] && \
 				PKGDEV=$(blkid /dev/cdrom | grep "$PKGSIGN" | cut -d: -f1)
 			if [ -n "$PKGDEV" ]; then
-				echo -n "Mounting packages archive from $PKGDEV..."
+				action 'Mounting packages archive from $PKGDEV...'
 				mkdir -p /packages; mount -t iso9660 -o ro $PKGDEV /packages
 				status
 				/packages/install.sh
diff -r cdb1a0f6966a -r 29ec74a6d359 etc/init.d/network.sh
--- a/etc/init.d/network.sh	Sat Nov 07 02:33:50 2015 +0200
+++ b/etc/init.d/network.sh	Fri Nov 27 12:48:01 2015 +0200
@@ -22,12 +22,12 @@
 
 boot() {
 	# Set hostname
-	echo -n "Setting hostname to: $(cat /etc/hostname)"
+	action "Setting hostname to: $(cat /etc/hostname)"
 	/bin/hostname -F /etc/hostname
 	status
 
 	# Configure loopback interface
-	echo -n 'Configuring loopback...'
+	action 'Configuring loopback...'
 	/sbin/ifconfig lo 127.0.0.1 up
 	/sbin/route add -net 127.0.0.0 netmask 255.0.0.0 dev lo
 	status
@@ -59,7 +59,7 @@
 		# notwithstanding to priority when scan_ssid=1
 		current_ssid="$(wpa_cli list_networks 2>/dev/null | fgrep '[CURRENT]' | cut -f2)"
 		if [ "$current_ssid" != "$WIFI_ESSID" ]; then
-			echo "Connecting to $WIFI_ESSID..."
+			action 'Connecting to $WIFI_ESSID...'
 			for i in $(seq 5); do
 				index=$(wpa_cli list_networks 2>/dev/null | \
 					grep -m1 -F $'\t'$WIFI_ESSID$'\t' | head -n1 | cut -f1)
@@ -96,7 +96,7 @@
 				/etc/network.conf
 		fi
 
-		echo -n "Configuring Wi-Fi interface $WIFI_INTERFACE..."
+		action 'Configuring Wi-Fi interface $WIFI_INTERFACE...'
 		ifconfig $WIFI_INTERFACE up 2>/dev/null
 		if iwconfig $WIFI_INTERFACE | fgrep -q 'Tx-Power'; then
 			iwconfig $WIFI_INTERFACE txpower on
diff -r cdb1a0f6966a -r 29ec74a6d359 etc/init.d/rcS
--- a/etc/init.d/rcS	Sat Nov 07 02:33:50 2015 +0200
+++ b/etc/init.d/rcS	Fri Nov 27 12:48:01 2015 +0200
@@ -20,12 +20,13 @@
 colorize 34 'Processing: /etc/init.d/rcS...'
 
 # Mount /proc
-echo -n 'Mounting proc filesystem on /proc'
-mount proc && status
+action 'Mounting proc filesystem on /proc'
+mount proc
+status
 
 # Trigger Udev and handle hotplug events
 if [ "$UDEV" == "yes" ]; then
-	echo -n 'Mounting devtmpfs filesystem on: /dev'
+	action 'Mounting devtmpfs filesystem on: /dev'
 	mount -t devtmpfs devtmpfs /dev
 	status
 
@@ -40,7 +41,7 @@
 	# Disable hotplug helper since udevd listen to netlink
 	echo '' > /proc/sys/kernel/hotplug
 else
-	echo -n 'Executing mdev -s to populate /dev...'
+	action 'Executing mdev -s to populate /dev...'
 	mdev -s && echo 'mdev' > /proc/sys/kernel/hotplug
 	status
 fi
@@ -77,7 +78,7 @@
 
 # Parse cmdline args for earlier boot options. All other boot options
 # are in /etc/init./bootopts.sh.
-echo -n 'Searching for early boot options...'
+action 'Searching for early boot options...'
 for opt in $(cat /proc/cmdline); do
 	case $opt in
 		modprobe=*)
@@ -95,7 +96,7 @@
 # Clean up the system and set up tmp dirs. */run/* are tmpfs so they are 
 # cleaned up at shutdown.
 if [ "$CLEAN_UP_SYSTEM" == 'yes' ]; then
-	echo -n 'Cleaning up the system...'
+	action 'Cleaning up the system...'
 	rm -rf /tmp
 	mkdir -p /tmp/.X11-unix /tmp/.ICE-unix
 	chmod -R 1777 /tmp
@@ -108,7 +109,7 @@
 if [ "$MODPROBE" ]; then
 	mods=$(sed -e 's/.* modprobe=\([^ ]*\).*/\1/' -e 's/,/\n/g' < /proc/cmdline)
 	for i in $mods; do
-		echo -n "Loading kernel module: $i"
+		action 'Loading kernel module: $i'
 		modprobe $i
 		status
 	done
@@ -131,7 +132,7 @@
 			CONFIG=""
 		fi
 	fi
-	echo -n "Source $SCRIPT from $DEVICE..."
+	action 'Source $SCRIPT from $DEVICE...'
 	if [ -n "$CONFIG" ]; then
 		. /mnt/$SCRIPT
 		umount /mnt 2> /dev/null || true
@@ -141,22 +142,22 @@
 
 # Mount /proc/bus/usb
 if [ -d /proc/bus/usb ]; then
-	echo -n 'Mounting usbfs filesystem on: /proc/bus/usb'
+	action 'Mounting usbfs filesystem on: /proc/bus/usb'
 	mount -t usbfs usbfs /proc/bus/usb
 	status
 fi
 
 # Start syslogd and klogd
-echo -n 'Starting system log daemon: syslogd...'
-syslogd -s $SYSLOGD_ROTATED_SIZE && status
-echo -n 'Starting kernel log daemon: klogd...'
-klogd && status
+action 'Starting system log daemon: syslogd...'
+syslogd -s $SYSLOGD_ROTATED_SIZE; status
+action 'Starting kernel log daemon: klogd...'
+klogd; status
 
 # Load all modules listed in config file
 if [ "$LOAD_MODULES" ]; then
 	colorize 33 'Loading Kernel modules...'
 	for mod in $LOAD_MODULES; do
-		echo -n "Loading module: $mod"
+		action 'Loading module: $mod'
 		modprobe $mod
 		status
 	done
@@ -171,7 +172,7 @@
 # Call udevadm trigger to ensure /dev is fully populated now that all
 # modules are loaded.
 if [ "$UDEV" == 'yes' ]; then
-	echo -n 'Triggering udev events: --action=add'
+	action 'Triggering udev events: --action=add'
 	udevadm trigger --action=add
 	status
 fi
diff -r cdb1a0f6966a -r 29ec74a6d359 etc/init.d/system.sh
--- a/etc/init.d/system.sh	Sat Nov 07 02:33:50 2015 +0200
+++ b/etc/init.d/system.sh	Fri Nov 27 12:48:01 2015 +0200
@@ -30,9 +30,10 @@
 	echo -e 'LANG=POSIX\nLC_ALL=POSIX' > /etc/locale.conf
 fi
 . /etc/locale.conf
-echo -n "Setting system locale: $LANG"
+action 'Setting system locale: $LANG'
 export LC_ALL=$LANG
-. /lib/libtaz.sh && status
+. /lib/libtaz.sh
+status
 
 # Keymap config: Default to us in live mode if kmap= was not used.
 if [ ! -s '/etc/keymap.conf' ]; then
@@ -40,7 +41,7 @@
 	echo 'us' > /etc/keymap.conf
 fi
 kmap=$(cat /etc/keymap.conf)
-echo -n "Loading console keymap: $kmap"
+action 'Loading console keymap: $kmap'
 /sbin/tazkeymap $kmap >/dev/null
 status
 
@@ -69,8 +70,9 @@
 	done
 fi
 if grep -q swap /etc/fstab; then
-	echo -n 'Activating swap memory...'
-	swapon -a && status
+	action 'Activating swap memory...'
+	swapon -a
+	status
 fi
 
 # Start TazPanel
@@ -84,10 +86,10 @@
 if [ -n "$DRIVER" ]; then
 	case "$DRIVER" in
 		no)
-			echo -n 'Removing all sound kernel modules...'
+			action 'Removing all sound kernel modules...'
 			rm -rf /lib/modules/$(uname -r)/kernel/sound
 			status
-			echo -n 'Removing all sound packages...'
+			action 'Removing all sound packages...'
 			for i in $(grep -l '^DEPENDS=.*alsa-lib' /var/lib/tazpkg/installed/*/receipt) ; do
 				pkg=${i#/var/lib/tazpkg/installed/}
 				echo 'y' | tazpkg remove ${pkg%/*} > /dev/null
diff -r cdb1a0f6966a -r 29ec74a6d359 init
--- a/init	Sat Nov 07 02:33:50 2015 +0200
+++ b/init	Fri Nov 27 12:48:01 2015 +0200
@@ -50,121 +50,124 @@
 # isofs [LORAM]
 #         do not use squashfs filesystem images, but the cdrom filesystem only
 
-fail()
-{
-echo -e '\033[70G[ \033[1;3'${1:-1mFailed}'\033[0;39m ]'
+
+fail() {
+	echo -e '\033[70G[ \033[1;3'${1:-1mFailed}'\033[0;39m ]'
 }
 
-quit()
-{
-[ -d /mnt$4/etc ] || return
-[ -n "$4" ] || busybox mount /mnt -o remount,ro
-busybox mount --move /run /mnt/${1:-run}
-cat>/run/init<<EOT
+
+quit() {
+	[ -d /mnt$4/etc ] || return
+	[ -n "$4" ] || busybox mount /mnt -o remount,ro
+	busybox mount --move /run /mnt/${1:-run}
+	cat > /run/init <<EOT
 $2
 x=/sbin/switch_root
 [ -x \$x ] && exec \$x mnt $3 /sbin/init
 EOT
-fail 2mDone
-exit
+	fail 2mDone
+	exit
 }
 
-arg()
-{
-grep -q $1 /proc/cmdline
+
+arg() {
+	grep -q $1 /proc/cmdline
 }
 
-got()
-{
-arg $1= && root="$(sed "s/.*$1=\([^ ]*\).*/\1/" </proc/cmdline)"
+
+got() {
+	arg $1= && root="$(sed "s/.*$1=\([^ ]*\).*/\1/" </proc/cmdline)"
 }
 
-msg()
-{
-echo "Switching / to $1..."
+
+msg() {
+	echo "Switching / to $1..."
 }
 
-use()
-{
-got $1 && msg "$1 $root"
+
+use() {
+	got $1 && msg "$1 $root"
 }
 
-mnt()
-{
-r=$(busybox blkid 2> /dev/null | sed "s|\"||g;/${root//[^a-zA-Z0-9]/.}/!d;s|:.*||;q")
-r=${r:-$root}
-if [ ! -b $r ]; then
-	r=${r#/dev/}
-	r=/dev/${r%%/*}
-fi
-d=${root#*$r}
-busybox mount $r $1 && return
-w=$(cat /sys/module/usb_storage/parameters/delay_use)
-w=$((1+${w:-2}))
-echo -n "Sleep $w seconds..."
-sleep $w
-busybox mount $r $1
+
+mnt() {
+	r=$(busybox blkid 2> /dev/null | sed "s|\"||g;/${root//[^a-zA-Z0-9]/.}/!d;s|:.*||;q")
+	r=${r:-$root}
+	if [ ! -b $r ]; then
+		r=${r#/dev/}
+		r=/dev/${r%%/*}
+	fi
+	d=${root#*$r}
+	busybox mount $r $1 && return
+	w=$(cat /sys/module/usb_storage/parameters/delay_use)
+	w=$((1+${w:-2}))
+	echo -n "Sleep $w seconds..."
+	sleep $w
+	busybox mount $r $1
 }
 
-mod()
-{
-for i in $@; do
-	echo "Loading module: $i"
-	modprobe $i 2>/dev/null || busybox insmod $(find /lib/modules|sed "/$i.ko/!dq")
-done
+
+mod() {
+	for i in $@; do
+		echo "Loading module: $i"
+		modprobe $i 2>/dev/null || busybox insmod $(find /lib/modules|sed "/$i.ko/!dq")
+	done
 }
 
-try()
-{
-if [ ! -d /mnt/etc ] && got cryptoroot; then
-	mod dm-mod dm-crypt aes-256
-	d=${root#/dev/}
-	l=crypto-$d
-	if cryptsetup isLuks $root 2>/dev/null; then
-		cryptsetup luksOpen $root $l
-	else
-		read -st 60 -p "Pass phrase : " p
-		k=$(echo $p|hashalot -x -n 32 sha512)
-		echo 0 $(cat $(find /sys/block|grep /$d/size))\
-		crypt aes-plain $k 0 $root 0|dmsetup create $l
+
+try() {
+	if [ ! -d /mnt/etc ] && got cryptoroot; then
+		mod dm-mod dm-crypt aes-256
+		d=${root#/dev/}
+		l=crypto-$d
+		if cryptsetup isLuks $root 2>/dev/null; then
+			cryptsetup luksOpen $root $l
+		else
+			read -st 60 -p "Pass phrase : " p
+			k=$(echo $p|hashalot -x -n 32 sha512)
+			echo 0 $(cat $(find /sys/block|grep /$d/size))\
+			crypt aes-plain $k 0 $root 0|dmsetup create $l
+		fi
+		busybox mount /dev/mapper/$l /mnt
 	fi
-	busybox mount /dev/mapper/$l /mnt
-fi
-got subroot && return
-got loopfs && return
-if [ -d /mnt/etc ]; then
-	for i in $@; do
-		cp -a $i /mnt$(dirname $i)
-	done
-	quit
-fi
-fail
+	got subroot && return
+	got loopfs && return
+	if [ -d /mnt/etc ]; then
+		for i in $@; do
+			cp -a $i /mnt$(dirname $i)
+		done
+		quit
+	fi
+	fail
 }
 
-lvm()
-{
-use lvmroot || return
-mod dm-mod
-vgscan --ignorelockingfailure
-vgchange -ay --ignorelockingfailure
-busybox mount /dev/mapper/$root /mnt
-try /dev/mapper $1
+
+lvm() {
+	use lvmroot || return
+	mod dm-mod
+	vgscan --ignorelockingfailure
+	vgchange -ay --ignorelockingfailure
+	busybox mount /dev/mapper/$root /mnt
+	try /dev/mapper $1
 }
 
-ldraid()
-{
-while read l; do
-	case "$l" in
-		*raid10*)	mod raid10;;
-		*raid0*)	mod raid0;;
-		*raid1*)	mod raid1;;
-		*raid*)		mod raid456;;
-		*mirror*)	mod dm-mirror;;
-	esac
-done
+
+ldraid() {
+	while read l; do
+		case "$l" in
+			*raid10*)	mod raid10;;
+			*raid0*)	mod raid0;;
+			*raid1*)	mod raid1;;
+			*raid*)		mod raid456;;
+			*mirror*)	mod dm-mirror;;
+		esac
+	done
 }
 
-if [ "$1" != "log" ]; then
+
+
+
+if [ "$1" != 'log' ]; then
 	busybox mount -t proc proc /proc
 	busybox mount -t sysfs sys /sys
 	busybox mount -t tmpfs tmpfs /run
@@ -175,6 +178,7 @@
 	. /run/init
 	sh
 fi
+
 for i in /sys/block/*/dev /sys/block/*/*/dev ; do
 	[ -s "$i" ] || continue
 	n=${i%/dev}
@@ -183,9 +187,12 @@
 	echo "Create $n "
 	mknod $n b $(sed 's/:/ /' < $i)
 done
+
 got modprobe && mod ${root//,/ }
+
 [ -d /proc/sys/dev/cdrom ] &&
 	ln -s $(sed '/name/!d;s/.*:[^a-z]*//' /proc/sys/dev/cdrom/info) /dev/cdrom
+
 if use dmraid; then
 	dmraid -s | sed '/^type/!ds/.*: *//' | ldraid
 	[ ${root:0:4} = /dev ] ||
@@ -209,6 +216,7 @@
 	lvm /etc/mdadm.conf
 fi
 lvm
+
 if got mount; then
 	dev=$root
 	x=$(busybox blkid|grep $dev|sed 's/:.*//;q')
@@ -219,6 +227,7 @@
 	arg posixovl && echo "And posixovl..." &&
 	mount.posixovl -F /mnt -- -oallow_other -odefault_permissions -osuid
 fi
+
 got loopfs && echo "Into file $root..." &&
 	losetup /dev/loop0 /mnt/$root && busybox mount /dev/loop0 /mnt
 got bindfs && echo "Bind ${root/,/ to }..." &&
@@ -242,17 +251,17 @@
 got rootfssize
 [ $(busybox free|busybox awk '/Mem:/{print int(($4*100)/$3)}') -ge $r ] &&
 	busybox mount -t tmpfs -o size=$root,nr_inodes=$inodes tmpfs /mnt &&
-for i in $(ls -ar /); do
-	case "$i" in
-	.*|cdrom)	;;
-	mnt|proc|sys)	mkdir /mnt/$i;;
-	usr|var|rootfs*) mv /$i /mnt;;
-	*)	cp -a /$i /mnt 2>/dev/null && continue
-		fail
-		busybox umount /mnt
-		exit
-	esac
-done || fail 3mSkipped
+	for i in $(ls -ar /); do
+		case "$i" in
+			.*|cdrom)	;;
+			mnt|proc|sys)	mkdir /mnt/$i;;
+			usr|var|rootfs*) mv /$i /mnt;;
+			*)	cp -a /$i /mnt 2>/dev/null && continue
+				fail
+				busybox umount /mnt
+				exit
+		esac
+	done || fail 3mSkipped
 quit
 mod squashfs 2>/dev/null || exit
 msg aufs