SliTaz Repositories

     1.1 --- a/etc/init.d/rcS	Mon Mar 23 18:18:15 2015 +0000
     1.2 +++ b/etc/init.d/rcS	Fri Nov 27 12:48:01 2015 +0200
     1.3 @@ -20,12 +20,13 @@
     1.4  colorize 34 'Processing: /etc/init.d/rcS...'
     1.5  
     1.6  # Mount /proc
     1.7 -echo -n 'Mounting proc filesystem on /proc'
     1.8 -mount proc && status
     1.9 +action 'Mounting proc filesystem on /proc'
    1.10 +mount proc
    1.11 +status
    1.12  
    1.13  # Trigger Udev and handle hotplug events
    1.14  if [ "$UDEV" == "yes" ]; then
    1.15 -	echo -n 'Mounting devtmpfs filesystem on: /dev'
    1.16 +	action 'Mounting devtmpfs filesystem on: /dev'
    1.17  	mount -t devtmpfs devtmpfs /dev
    1.18  	status
    1.19  
    1.20 @@ -40,7 +41,7 @@
    1.21  	# Disable hotplug helper since udevd listen to netlink
    1.22  	echo '' > /proc/sys/kernel/hotplug
    1.23  else
    1.24 -	echo -n 'Executing mdev -s to populate /dev...'
    1.25 +	action 'Executing mdev -s to populate /dev...'
    1.26  	mdev -s && echo 'mdev' > /proc/sys/kernel/hotplug
    1.27  	status
    1.28  fi
    1.29 @@ -77,7 +78,7 @@
    1.30  
    1.31  # Parse cmdline args for earlier boot options. All other boot options
    1.32  # are in /etc/init./bootopts.sh.
    1.33 -echo -n 'Searching for early boot options...'
    1.34 +action 'Searching for early boot options...'
    1.35  for opt in $(cat /proc/cmdline); do
    1.36  	case $opt in
    1.37  		modprobe=*)
    1.38 @@ -95,7 +96,7 @@
    1.39  # Clean up the system and set up tmp dirs. */run/* are tmpfs so they are 
    1.40  # cleaned up at shutdown.
    1.41  if [ "$CLEAN_UP_SYSTEM" == 'yes' ]; then
    1.42 -	echo -n 'Cleaning up the system...'
    1.43 +	action 'Cleaning up the system...'
    1.44  	rm -rf /tmp
    1.45  	mkdir -p /tmp/.X11-unix /tmp/.ICE-unix
    1.46  	chmod -R 1777 /tmp
    1.47 @@ -108,7 +109,7 @@
    1.48  if [ "$MODPROBE" ]; then
    1.49  	mods=$(sed -e 's/.* modprobe=\([^ ]*\).*/\1/' -e 's/,/\n/g' < /proc/cmdline)
    1.50  	for i in $mods; do
    1.51 -		echo -n "Loading kernel module: $i"
    1.52 +		action 'Loading kernel module: $i'
    1.53  		modprobe $i
    1.54  		status
    1.55  	done
    1.56 @@ -131,7 +132,7 @@
    1.57  			CONFIG=""
    1.58  		fi
    1.59  	fi
    1.60 -	echo -n "Source $SCRIPT from $DEVICE..."
    1.61 +	action 'Source $SCRIPT from $DEVICE...'
    1.62  	if [ -n "$CONFIG" ]; then
    1.63  		. /mnt/$SCRIPT
    1.64  		umount /mnt 2> /dev/null || true
    1.65 @@ -141,22 +142,22 @@
    1.66  
    1.67  # Mount /proc/bus/usb
    1.68  if [ -d /proc/bus/usb ]; then
    1.69 -	echo -n 'Mounting usbfs filesystem on: /proc/bus/usb'
    1.70 +	action 'Mounting usbfs filesystem on: /proc/bus/usb'
    1.71  	mount -t usbfs usbfs /proc/bus/usb
    1.72  	status
    1.73  fi
    1.74  
    1.75  # Start syslogd and klogd
    1.76 -echo -n 'Starting system log daemon: syslogd...'
    1.77 -syslogd -s $SYSLOGD_ROTATED_SIZE && status
    1.78 -echo -n 'Starting kernel log daemon: klogd...'
    1.79 -klogd && status
    1.80 +action 'Starting system log daemon: syslogd...'
    1.81 +syslogd -s $SYSLOGD_ROTATED_SIZE; status
    1.82 +action 'Starting kernel log daemon: klogd...'
    1.83 +klogd; status
    1.84  
    1.85  # Load all modules listed in config file
    1.86  if [ "$LOAD_MODULES" ]; then
    1.87  	colorize 33 'Loading Kernel modules...'
    1.88  	for mod in $LOAD_MODULES; do
    1.89 -		echo -n "Loading module: $mod"
    1.90 +		action 'Loading module: $mod'
    1.91  		modprobe $mod
    1.92  		status
    1.93  	done
    1.94 @@ -171,7 +172,7 @@
    1.95  # Call udevadm trigger to ensure /dev is fully populated now that all
    1.96  # modules are loaded.
    1.97  if [ "$UDEV" == 'yes' ]; then
    1.98 -	echo -n 'Triggering udev events: --action=add'
    1.99 +	action 'Triggering udev events: --action=add'
   1.100  	udevadm trigger --action=add
   1.101  	status
   1.102  fi