slitaz-boot-scripts rev 436

etc/init.d/{bootopts.sh,network.sh,rcS}: follow changes in the libtaz.sh for i18n functions.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Jan 09 02:20:10 2017 +0200 (2017-01-09)
parents 86e104f5625d
children 30df2eac7040
files etc/init.d/bootopts.sh etc/init.d/network.sh etc/init.d/rcS
line diff
     1.1 --- a/etc/init.d/bootopts.sh	Sat Jan 07 12:30:04 2017 +0100
     1.2 +++ b/etc/init.d/bootopts.sh	Mon Jan 09 02:20:10 2017 +0200
     1.3 @@ -40,7 +40,7 @@
     1.4  		cp /etc/slitaz/applications.conf /etc/skel/.config/slitaz
     1.5  	fi
     1.6  
     1.7 -	action 'Configuring user and group: $USER...'
     1.8 +	action 'Configuring user and group: %s...' "$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 @@ -78,13 +78,13 @@
    1.13  		kmap=*)
    1.14  			# Check for a specified keymap (kmap=*).
    1.15  			KEYMAP=${opt#kmap=}
    1.16 -			action 'Setting system keymap to: $KEYMAP...'
    1.17 +			action 'Setting system keymap to: %s...' "$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 -			action 'Setting console font to: $FONT...'
    1.24 +			action 'Setting console font to: %s...' "$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 @@ -187,7 +187,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 -				action 'Mounting packages archive from $PKGDEV...'
    1.33 +				action 'Mounting packages archive from %s...' "$PKGDEV"
    1.34  				mkdir -p /packages; mount -t iso9660 -o ro $PKGDEV /packages
    1.35  				status
    1.36  				/packages/install.sh
     2.1 --- a/etc/init.d/network.sh	Sat Jan 07 12:30:04 2017 +0100
     2.2 +++ b/etc/init.d/network.sh	Mon Jan 09 02:20:10 2017 +0200
     2.3 @@ -41,7 +41,7 @@
     2.4  
     2.5  boot() {
     2.6  	# Set hostname
     2.7 -	action "Setting hostname to: $(cat /etc/hostname)"
     2.8 +	action 'Setting hostname to: %s' "$(cat /etc/hostname)"
     2.9  	/bin/hostname -F /etc/hostname
    2.10  	status
    2.11  
    2.12 @@ -115,7 +115,7 @@
    2.13  		current_ssid="$(wpa_cli list_networks 2>/dev/null | fgrep '[CURRENT]' | cut -f2)"
    2.14  		if [ "$current_ssid" != "$WIFI_ESSID" ]; then
    2.15  			notification start "$(_ 'Connecting to %s...' "$WIFI_ESSID")"
    2.16 -			action 'Connecting to $WIFI_ESSID...'
    2.17 +			action 'Connecting to %s...' "$WIFI_ESSID"
    2.18  			for i in $(seq 5); do
    2.19  				index=$(wpa_cli list_networks 2>/dev/null | \
    2.20  					grep -m1 -F $'\t'$WIFI_ESSID$'\t' | head -n1 | cut -f1)
    2.21 @@ -153,7 +153,7 @@
    2.22  		fi
    2.23  
    2.24  		notification start "$(_ 'Starting Wi-Fi interface %s...' "$WIFI_INTERFACE")"
    2.25 -		action 'Configuring Wi-Fi interface $WIFI_INTERFACE...'
    2.26 +		action 'Configuring Wi-Fi interface %s...' "$WIFI_INTERFACE"
    2.27  		ifconfig $WIFI_INTERFACE up 2>/dev/null
    2.28  		if iwconfig $WIFI_INTERFACE | fgrep -q 'Tx-Power'; then
    2.29  			iwconfig $WIFI_INTERFACE txpower on
     3.1 --- a/etc/init.d/rcS	Sat Jan 07 12:30:04 2017 +0100
     3.2 +++ b/etc/init.d/rcS	Mon Jan 09 02:20:10 2017 +0200
     3.3 @@ -109,7 +109,7 @@
     3.4  if [ "$MODPROBE" ]; then
     3.5  	mods=$(sed -e 's/.* modprobe=\([^ ]*\).*/\1/' -e 's/,/\n/g' < /proc/cmdline)
     3.6  	for i in $mods; do
     3.7 -		action 'Loading kernel module: $i'
     3.8 +		action 'Loading kernel module: %s' "$i"
     3.9  		modprobe $i
    3.10  		status
    3.11  	done
    3.12 @@ -132,7 +132,7 @@
    3.13  			CONFIG=""
    3.14  		fi
    3.15  	fi
    3.16 -	action 'Source $SCRIPT from $DEVICE...'
    3.17 +	action 'Source %s from %s...' "$SCRIPT" "$DEVICE"
    3.18  	if [ -n "$CONFIG" ]; then
    3.19  		. /mnt/$SCRIPT
    3.20  		umount /mnt 2> /dev/null || true
    3.21 @@ -157,7 +157,7 @@
    3.22  if [ "$LOAD_MODULES" ]; then
    3.23  	colorize 33 'Loading Kernel modules...'
    3.24  	for mod in $LOAD_MODULES; do
    3.25 -		action 'Loading module: $mod'
    3.26 +		action 'Loading module: %s' "$mod"
    3.27  		modprobe $mod
    3.28  		status
    3.29  	done