# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1483921210 -7200
# Node ID b09c326b93748d05a97fd6c14e819d99038a082d
# Parent  86e104f5625df3755e975f659520c5629a3bfa7b
etc/init.d/{bootopts.sh,network.sh,rcS}: follow changes in the libtaz.sh for i18n functions.

diff -r 86e104f5625d -r b09c326b9374 etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Sat Jan 07 12:30:04 2017 +0100
+++ b/etc/init.d/bootopts.sh	Mon Jan 09 02:20:10 2017 +0200
@@ -40,7 +40,7 @@
 		cp /etc/slitaz/applications.conf /etc/skel/.config/slitaz
 	fi
 
-	action 'Configuring user and group: $USER...'
+	action 'Configuring user and group: %s...' "$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
@@ -78,13 +78,13 @@
 		kmap=*)
 			# Check for a specified keymap (kmap=*).
 			KEYMAP=${opt#kmap=}
-			action 'Setting system keymap to: $KEYMAP...'
+			action 'Setting system keymap to: %s...' "$KEYMAP"
 			echo "$KEYMAP" > /etc/keymap.conf
 			status ;;
 		font=*)
 			# Check for a specified console font (font=*).
 			FONT=${opt#font=}
-			action 'Setting console font to: $FONT...'
+			action 'Setting console font to: %s...' "$FONT"
 			for con in 1 2 3 4 5 6; do
 				setfont $FONT -C /dev/tty$con
 			done
@@ -187,7 +187,7 @@
 			[ -z "$PKGDEV" -a -L /dev/cdrom ] && \
 				PKGDEV=$(blkid /dev/cdrom | grep "$PKGSIGN" | cut -d: -f1)
 			if [ -n "$PKGDEV" ]; then
-				action 'Mounting packages archive from $PKGDEV...'
+				action 'Mounting packages archive from %s...' "$PKGDEV"
 				mkdir -p /packages; mount -t iso9660 -o ro $PKGDEV /packages
 				status
 				/packages/install.sh
diff -r 86e104f5625d -r b09c326b9374 etc/init.d/network.sh
--- a/etc/init.d/network.sh	Sat Jan 07 12:30:04 2017 +0100
+++ b/etc/init.d/network.sh	Mon Jan 09 02:20:10 2017 +0200
@@ -41,7 +41,7 @@
 
 boot() {
 	# Set hostname
-	action "Setting hostname to: $(cat /etc/hostname)"
+	action 'Setting hostname to: %s' "$(cat /etc/hostname)"
 	/bin/hostname -F /etc/hostname
 	status
 
@@ -115,7 +115,7 @@
 		current_ssid="$(wpa_cli list_networks 2>/dev/null | fgrep '[CURRENT]' | cut -f2)"
 		if [ "$current_ssid" != "$WIFI_ESSID" ]; then
 			notification start "$(_ 'Connecting to %s...' "$WIFI_ESSID")"
-			action 'Connecting to $WIFI_ESSID...'
+			action 'Connecting to %s...' "$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)
@@ -153,7 +153,7 @@
 		fi
 
 		notification start "$(_ 'Starting Wi-Fi interface %s...' "$WIFI_INTERFACE")"
-		action 'Configuring Wi-Fi interface $WIFI_INTERFACE...'
+		action 'Configuring Wi-Fi interface %s...' "$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 86e104f5625d -r b09c326b9374 etc/init.d/rcS
--- a/etc/init.d/rcS	Sat Jan 07 12:30:04 2017 +0100
+++ b/etc/init.d/rcS	Mon Jan 09 02:20:10 2017 +0200
@@ -109,7 +109,7 @@
 if [ "$MODPROBE" ]; then
 	mods=$(sed -e 's/.* modprobe=\([^ ]*\).*/\1/' -e 's/,/\n/g' < /proc/cmdline)
 	for i in $mods; do
-		action 'Loading kernel module: $i'
+		action 'Loading kernel module: %s' "$i"
 		modprobe $i
 		status
 	done
@@ -132,7 +132,7 @@
 			CONFIG=""
 		fi
 	fi
-	action 'Source $SCRIPT from $DEVICE...'
+	action 'Source %s from %s...' "$SCRIPT" "$DEVICE"
 	if [ -n "$CONFIG" ]; then
 		. /mnt/$SCRIPT
 		umount /mnt 2> /dev/null || true
@@ -157,7 +157,7 @@
 if [ "$LOAD_MODULES" ]; then
 	colorize 33 'Loading Kernel modules...'
 	for mod in $LOAD_MODULES; do
-		action 'Loading module: $mod'
+		action 'Loading module: %s' "$mod"
 		modprobe $mod
 		status
 	done