slitaz-arm rev 69
Fixes to sat-rpi release/install.sh and rpi-desktop packages list
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Mar 17 22:26:48 2014 +0100 (2014-03-17) |
parents | a92d7d48dd29 |
children | de766d155dae |
files | flavors/rpi-desktop/packages.list rootfs/etc/init.d/system.sh rpi/release/install.sh sat-rpi |
line diff
1.1 --- a/flavors/rpi-desktop/packages.list Mon Mar 17 19:46:45 2014 +0000 1.2 +++ b/flavors/rpi-desktop/packages.list Mon Mar 17 22:26:48 2014 +0100 1.3 @@ -5,6 +5,7 @@ 1.4 kbd-base 1.5 slitaz-base-files 1.6 slitaz-boot-scripts 1.7 +slitaz-configs-base 1.8 slitaz-tools 1.9 slitaz-icon 1.10 slitaz-polar-cursors 1.11 @@ -74,12 +75,13 @@ 1.12 xorg-libXcursor 1.13 xorg-libXrandr 1.14 xorg-libXdamage 1.15 +xorg-libXfixes 1.16 xorg-libfontenc 1.17 xorg-xkbcomp 1.18 xorg-server-light 1.19 xorg-base-fonts 1.20 xorg-xf86-input-evdev 1.21 -xorg-xf86-input-fbdev 1.22 +xorg-xf86-video-fbdev 1.23 xorg-xload 1.24 xorg-xclock 1.25 ttf-dejavu 1.26 @@ -91,6 +93,7 @@ 1.27 imlib2 1.28 hsetroot 1.29 jwm 1.30 +xterm 1.31 fox 1.32 adie 1.33 pathfinder
2.1 --- a/rootfs/etc/init.d/system.sh Mon Mar 17 19:46:45 2014 +0000 2.2 +++ b/rootfs/etc/init.d/system.sh Mon Mar 17 22:26:48 2014 +0100 2.3 @@ -14,8 +14,8 @@ 2.4 fi 2.5 2.6 # Sound configuration: restore or init 2.7 -if [ -d /proc/asound ]; then 2.8 - if [ -s /var/lib/alsa/asound.state ]; then 2.9 +if [ -d "/proc/asound" ] && [ -x "/usr/sbin/alsactl" ]; then 2.10 + if [ -s "/var/lib/alsa/asound.state" ]; then 2.11 echo -n "Restoring sound configuration..." 2.12 alsactl restore; status 2.13 else 2.14 @@ -43,7 +43,7 @@ 2.15 export TZ=${tz}; status 2.16 2.17 # Xorg configuration: $HOME is not yet set 2.18 -if [ ! -s /etc/X11/xorg.conf ] && [ -x /usr/bin/Xorg ]; then 2.19 +if [ ! -s "/etc/X11/xorg.conf" ] && [ -x "/usr/bin/Xorg" ]; then 2.20 echo "Configuring Xorg server..." && HOME="/root" 2.21 tazx config-xorg 2>/var/log/xorg.configure.log 2.22 fi
3.1 --- a/rpi/release/install.sh Mon Mar 17 19:46:45 2014 +0000 3.2 +++ b/rpi/release/install.sh Mon Mar 17 22:26:48 2014 +0100 3.3 @@ -56,8 +56,10 @@ 3.4 EOT 3.5 3.6 # SD card check 3.7 -[ "$dev" ] || echo -n "SD card device name (ex sdc): "; read dev 3.8 -[ "$dev" ] || exit 1 3.9 +if [ ! "$dev" ]; then 3.10 + echo -n "SD card disk name (ex sdc): "; read dev 3.11 +fi 3.12 +[ ! "$dev" ] && exit 1 3.13 if ! fdisk -l | grep -q "/dev/${dev}3"; then 3.14 echo "Unable to find: /dev/${dev}3"; exit 1 3.15 fi
4.1 --- a/sat-rpi Mon Mar 17 19:46:45 2014 +0000 4.2 +++ b/sat-rpi Mon Mar 17 22:26:48 2014 +0100 4.3 @@ -152,8 +152,10 @@ 4.4 rpiboot="/media/rpi/boot" 4.5 rpiroot="/media/rpi/rootfs" 4.6 header "SliTaz Raspberry Pi install" 4.7 - [ "$dev" ] || echo -n "SD card device name (ex sdc): "; read dev 4.8 - [ "$dev" ] || exit 1 4.9 + if [ ! "$dev" ]; then 4.10 + echo -n "SD card disk name (ex sdc): "; read dev 4.11 + fi 4.12 + [ ! "$dev" ] && exit 1 4.13 4.14 # Store sdcard partition(s) list 4.15 fdisk -l /dev/${dev} | grep "^/dev/$dev" | awk '{print $1}' \