# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1334671000 -7200
# Node ID 8cc80e0d7d4efb91ebdec86d3da994f5e408bc15
# Parent  ee634adc6b03a30ac1f7458cca506b9e8d641ca6
No more locale/keymap config at boot! Use syslinux menu. and fix opt wm=

diff -r ee634adc6b03 -r 8cc80e0d7d4e etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Fri Apr 06 08:18:09 2012 +0200
+++ b/etc/init.d/bootopts.sh	Tue Apr 17 15:56:40 2012 +0200
@@ -148,9 +148,6 @@
 			do
 				modprobe $mod
 			done
-			grep -qs batt /etc/lxpanel/default/panels/panel ||
-			sed -i 's/= cpu/= batt\n}\n\nPlugin {\n    type = cpu/' \
-				/etc/lxpanel/default/panels/panel 2> /dev/null
 			# Enable Kernel Laptop mode.
 			echo "5" > /proc/sys/vm/laptop_mode ;;
 		mount)
@@ -183,17 +180,18 @@
 			fi ;;
 		wm=*)
 			# Check for a Window Manager (for a flavor, default WM can be changed
-			# with boot options or with an addfile in /etc/X11/wm.default.
+			# with boot options or via /etc/slitaz/applications.conf).
 			WM=${opt#wm=}
-			mkdir -p /etc/X11
 			case $WM in
-				jwm)
-					echo "jwm" > /etc/X11/wm.default ;;
 				ob|openbox|openbox-session)
-					echo "openbox" > /etc/X11/wm.default ;;
+					WM=openbox-session ;;
 				e17|enlightenment|enlightenment_start)
-					echo "enlightenment" > /etc/X11/wm.default ;;
-			esac ;;
+					WM=enlightenment ;;
+				razorqt|razor-session)
+					WM=razor-session ;;
+			esac
+			sed -i s/"WINDOW_MANAGER=.*"/"WINDOW_MANAGER=\"$WM\""/ \
+				/etc/slitaz/applications.conf ;;
 		*)
 			continue ;;
 	esac
diff -r ee634adc6b03 -r 8cc80e0d7d4e etc/init.d/system.sh
--- a/etc/init.d/system.sh	Fri Apr 06 08:18:09 2012 +0200
+++ b/etc/init.d/system.sh	Tue Apr 17 15:56:40 2012 +0200
@@ -85,28 +85,24 @@
 # Locale config. Do a gui config for both lang/keymap.
 echo "Checking if /etc/locale.conf exists... "
 if [ ! -s "/etc/locale.conf" ]; then
-	if [ "$SCREEN" != "text" ] && [ -x /usr/bin/Xorg ]; then
-		echo "Starting TazBox configuration..."
-		DISPLAY=:1 tazbox boot
-	else
-		tazlocale
-	fi
-else
-	lang=$(cat /etc/locale.conf | fgrep LANG | cut -d "=" -f 2)
-	echo -n "Locale configuration: $lang" && status
+	echo "Setting system locale to: C (English)"
+	echo -e "LANG=POSIX\nLC_ALL=POSIX" > /etc/locale.conf
 fi
+echo -n "Locale configuration: $LANG"
+. /etc/locale.conf
+export LANG LC_ALL
+status
 
 # Keymap config.
-if [ -s "/etc/keymap.conf" ]; then
-	KEYMAP=$(cat /etc/keymap.conf)
-	echo "Keymap configuration: $KEYMAP"
-	if [ -x /bin/loadkeys ]; then
-		loadkeys $KEYMAP
-	else
-		loadkmap < /usr/share/kmap/$KEYMAP.kmap
-	fi
+if [ ! -s "/etc/keymap.conf" ]; then
+	echo "us" > /etc/keymap.conf
+fi
+KEYMAP=$(cat /etc/keymap.conf)
+echo "Keymap configuration: $KEYMAP"
+if [ -x /bin/loadkeys ]; then
+	loadkeys $KEYMAP
 else
-	tazkeymap
+	loadkmap < /usr/share/kmap/$KEYMAP.kmap
 fi
 
 # Timezone config. Set timezone using the keymap config for fr, be, fr_CH