slitaz-boot-scripts diff etc/init.d/bootopts.sh @ rev 416

Use 'action' before 'status' in pair
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Nov 27 12:48:01 2015 +0200 (2015-11-27)
parents e95fbf28ebb8
children 23d89ddc30ad
line diff
     1.1 --- a/etc/init.d/bootopts.sh	Sat Aug 29 21:12:39 2015 +0200
     1.2 +++ b/etc/init.d/bootopts.sh	Fri Nov 27 12:48:01 2015 +0200
     1.3 @@ -41,7 +41,7 @@
     1.4  		cp /etc/slitaz/applications.conf /etc/skel/.config/slitaz
     1.5  	fi
     1.6  
     1.7 -	echo -n "Configuring user and group: $USER..."
     1.8 +	action 'Configuring user and group: $USER...'
     1.9  	adduser -D -s /bin/sh -g 'SliTaz User' -G users -h /home/$USER $USER
    1.10  	passwd -d $USER >/dev/null
    1.11  	for group in audio cdrom video tty plugdev disk; do
    1.12 @@ -73,13 +73,13 @@
    1.13  		kmap=*)
    1.14  			# Check for a specified keymap (kmap=*).
    1.15  			KEYMAP=${opt#kmap=}
    1.16 -			echo -n "Setting system keymap to: $KEYMAP..."
    1.17 +			action 'Setting system keymap to: $KEYMAP...'
    1.18  			echo "$KEYMAP" > /etc/keymap.conf
    1.19  			status ;;
    1.20  		font=*)
    1.21  			# Check for a specified console font (font=*).
    1.22  			FONT=${opt#font=}
    1.23 -			echo -n "Setting console font to: $FONT..."
    1.24 +			action 'Setting console font to: $FONT...'
    1.25  			for con in 1 2 3 4 5 6; do
    1.26  				setfont $FONT -C /dev/tty$con
    1.27  			done
    1.28 @@ -182,7 +182,7 @@
    1.29  			[ -z "$PKGDEV" -a -L /dev/cdrom ] && \
    1.30  				PKGDEV=$(blkid /dev/cdrom | grep "$PKGSIGN" | cut -d: -f1)
    1.31  			if [ -n "$PKGDEV" ]; then
    1.32 -				echo -n "Mounting packages archive from $PKGDEV..."
    1.33 +				action 'Mounting packages archive from $PKGDEV...'
    1.34  				mkdir -p /packages; mount -t iso9660 -o ro $PKGDEV /packages
    1.35  				status
    1.36  				/packages/install.sh