# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1398958435 -7200
# Node ID 45bca87a4ab8f96a6f23c4fcac71c4fb75849dcd
# Parent  01f9556204ee1f139889951dfd002c1731b62bda
Small fix to tzberry and boot scripts

diff -r 01f9556204ee -r 45bca87a4ab8 rootfs/etc/init.d/post-install.sh
--- a/rootfs/etc/init.d/post-install.sh	Thu May 01 09:53:34 2014 +0200
+++ b/rootfs/etc/init.d/post-install.sh	Thu May 01 17:33:55 2014 +0200
@@ -23,7 +23,7 @@
 #dialog --yesno "$user account was created. Do you want X autologin ?"
 
 # Wireless ?
-if ifconfig -a | grep "wlan[0-9]"; then
+if ifconfig -a | grep -q "wlan[0-9]"; then
 	dialog --title "{ Network config }" \
 		--yesno "\nDo you wish to setup a Wi-Fi network connection ?" 10 72
 	[ "$?" == "0" ] && slitaz-config wifi_setup
@@ -33,6 +33,9 @@
 mkdir -p /var/lib/slitaz
 echo "$ARCH" > /var/lib/slitaz/post-install
 
+# Stop networking since it will be restarted by /etc/init.d/network.sh
+stopd network.sh >/dev/null && rm -rf /run/wpa_supplicant
+
 # Run packages post_install since when we generate a distro from
 # an i486 machine we can't chroot and run ARM binaries. If we don't
 # run some post_install we will miss gtk icon, pango modules, etc...
diff -r 01f9556204ee -r 45bca87a4ab8 rootfs/etc/init.d/rcS
--- a/rootfs/etc/init.d/rcS	Thu May 01 09:53:34 2014 +0200
+++ b/rootfs/etc/init.d/rcS	Thu May 01 17:33:55 2014 +0200
@@ -81,6 +81,11 @@
 # Start X session
 if [ "$LOGIN_MANAGER" ] && [ -x "/etc/init.d/$LOGIN_MANAGER" ]; then
 	colorize 36 "Starting X environment..."
+	# We need Xorg 40-Keyboard.conf and SliTaz applications.conf
+	if [ ! -s "/etc/X11/xorg.conf.d/40-Keyboard.conf" ]; then
+		echo "Configuring Xorg server..." && HOME="/root" 
+		tazx init
+	fi
 	/etc/init.d/$LOGIN_MANAGER start >/dev/null &
 fi
 
diff -r 01f9556204ee -r 45bca87a4ab8 rootfs/etc/init.d/system.sh
--- a/rootfs/etc/init.d/system.sh	Thu May 01 09:53:34 2014 +0200
+++ b/rootfs/etc/init.d/system.sh	Thu May 01 17:33:55 2014 +0200
@@ -42,9 +42,3 @@
 	echo "Syncing system time..."
 	ntpd -q -p ${$NTPD_HOST}; status
 fi
-
-# We need Xorg 40-Keyboard.conf and SliTaz applications.conf
-if [ ! -s "/etc/X11/xorg.conf" ] && [ -x "/usr/bin/Xorg" ]; then
-	echo "Configuring Xorg server..." && 
-	HOME="/root" tazx init
-fi
diff -r 01f9556204ee -r 45bca87a4ab8 rpi/tazberry
--- a/rpi/tazberry	Thu May 01 09:53:34 2014 +0200
+++ b/rpi/tazberry	Thu May 01 17:33:55 2014 +0200
@@ -355,7 +355,7 @@
 		--gauge "" 8 ${width} 0
 	
 	# Reboot ?
-	reboot_ox \
+	reboot_box \
 		"$(gettext 'SliTaz is configured for the PiCam but you need a reboot to use it.')"
 }