# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1395091608 -3600
# Node ID e4d89b2237c7a24408834ac083e83d04362498ea
# Parent  a92d7d48dd293d6b6f075cb3b5577b81ed3de00b
Fixes to sat-rpi release/install.sh and rpi-desktop packages list

diff -r a92d7d48dd29 -r e4d89b2237c7 flavors/rpi-desktop/packages.list
--- a/flavors/rpi-desktop/packages.list	Mon Mar 17 19:46:45 2014 +0000
+++ b/flavors/rpi-desktop/packages.list	Mon Mar 17 22:26:48 2014 +0100
@@ -5,6 +5,7 @@
 kbd-base
 slitaz-base-files
 slitaz-boot-scripts
+slitaz-configs-base
 slitaz-tools
 slitaz-icon
 slitaz-polar-cursors
@@ -74,12 +75,13 @@
 xorg-libXcursor
 xorg-libXrandr
 xorg-libXdamage
+xorg-libXfixes
 xorg-libfontenc
 xorg-xkbcomp
 xorg-server-light
 xorg-base-fonts
 xorg-xf86-input-evdev
-xorg-xf86-input-fbdev
+xorg-xf86-video-fbdev
 xorg-xload
 xorg-xclock
 ttf-dejavu
@@ -91,6 +93,7 @@
 imlib2
 hsetroot
 jwm
+xterm
 fox
 adie
 pathfinder
diff -r a92d7d48dd29 -r e4d89b2237c7 rootfs/etc/init.d/system.sh
--- a/rootfs/etc/init.d/system.sh	Mon Mar 17 19:46:45 2014 +0000
+++ b/rootfs/etc/init.d/system.sh	Mon Mar 17 22:26:48 2014 +0100
@@ -14,8 +14,8 @@
 fi
 
 # Sound configuration: restore or init
-if [ -d /proc/asound ]; then
-	if [ -s /var/lib/alsa/asound.state ]; then
+if [ -d "/proc/asound" ] && [ -x "/usr/sbin/alsactl" ]; then
+	if [ -s "/var/lib/alsa/asound.state" ]; then
 		echo -n "Restoring sound configuration..."
 		alsactl restore; status
 	else
@@ -43,7 +43,7 @@
 export TZ=${tz}; status
 
 # Xorg configuration: $HOME is not yet set
-if [ ! -s /etc/X11/xorg.conf ] && [ -x /usr/bin/Xorg ]; then
+if [ ! -s "/etc/X11/xorg.conf" ] && [ -x "/usr/bin/Xorg" ]; then
 	echo "Configuring Xorg server..." && HOME="/root"
 	tazx config-xorg 2>/var/log/xorg.configure.log
 fi
diff -r a92d7d48dd29 -r e4d89b2237c7 rpi/release/install.sh
--- a/rpi/release/install.sh	Mon Mar 17 19:46:45 2014 +0000
+++ b/rpi/release/install.sh	Mon Mar 17 22:26:48 2014 +0100
@@ -56,8 +56,10 @@
 EOT
 
 # SD card check
-[ "$dev" ] || echo -n "SD card device name (ex sdc): "; read dev
-[ "$dev" ] || exit 1
+if [ ! "$dev" ]; then
+	echo -n "SD card disk name (ex sdc): "; read dev
+fi
+[ ! "$dev" ] && exit 1
 if ! fdisk -l | grep -q "/dev/${dev}3"; then
 	echo "Unable to find: /dev/${dev}3"; exit 1
 fi
diff -r a92d7d48dd29 -r e4d89b2237c7 sat-rpi
--- a/sat-rpi	Mon Mar 17 19:46:45 2014 +0000
+++ b/sat-rpi	Mon Mar 17 22:26:48 2014 +0100
@@ -152,8 +152,10 @@
 		rpiboot="/media/rpi/boot"
 		rpiroot="/media/rpi/rootfs"
 		header "SliTaz Raspberry Pi install"
-		[ "$dev" ] || echo -n "SD card device name (ex sdc): "; read dev
-		[ "$dev" ] || exit 1
+		if [ ! "$dev" ]; then
+			echo -n "SD card disk name (ex sdc): "; read dev
+		fi
+		[ ! "$dev" ] && exit 1
 		
 		# Store sdcard partition(s) list
 		fdisk -l /dev/${dev} | grep "^/dev/$dev" | awk '{print $1}' \