slitaz-arm rev 158

Small fix to tzberry and boot scripts
author Christophe Lincoln <pankso@slitaz.org>
date Thu May 01 17:33:55 2014 +0200 (2014-05-01)
parents 01f9556204ee
children d69007b16aa0
files rootfs/etc/init.d/post-install.sh rootfs/etc/init.d/rcS rootfs/etc/init.d/system.sh rpi/tazberry
line diff
     1.1 --- a/rootfs/etc/init.d/post-install.sh	Thu May 01 09:53:34 2014 +0200
     1.2 +++ b/rootfs/etc/init.d/post-install.sh	Thu May 01 17:33:55 2014 +0200
     1.3 @@ -23,7 +23,7 @@
     1.4  #dialog --yesno "$user account was created. Do you want X autologin ?"
     1.5  
     1.6  # Wireless ?
     1.7 -if ifconfig -a | grep "wlan[0-9]"; then
     1.8 +if ifconfig -a | grep -q "wlan[0-9]"; then
     1.9  	dialog --title "{ Network config }" \
    1.10  		--yesno "\nDo you wish to setup a Wi-Fi network connection ?" 10 72
    1.11  	[ "$?" == "0" ] && slitaz-config wifi_setup
    1.12 @@ -33,6 +33,9 @@
    1.13  mkdir -p /var/lib/slitaz
    1.14  echo "$ARCH" > /var/lib/slitaz/post-install
    1.15  
    1.16 +# Stop networking since it will be restarted by /etc/init.d/network.sh
    1.17 +stopd network.sh >/dev/null && rm -rf /run/wpa_supplicant
    1.18 +
    1.19  # Run packages post_install since when we generate a distro from
    1.20  # an i486 machine we can't chroot and run ARM binaries. If we don't
    1.21  # run some post_install we will miss gtk icon, pango modules, etc...
     2.1 --- a/rootfs/etc/init.d/rcS	Thu May 01 09:53:34 2014 +0200
     2.2 +++ b/rootfs/etc/init.d/rcS	Thu May 01 17:33:55 2014 +0200
     2.3 @@ -81,6 +81,11 @@
     2.4  # Start X session
     2.5  if [ "$LOGIN_MANAGER" ] && [ -x "/etc/init.d/$LOGIN_MANAGER" ]; then
     2.6  	colorize 36 "Starting X environment..."
     2.7 +	# We need Xorg 40-Keyboard.conf and SliTaz applications.conf
     2.8 +	if [ ! -s "/etc/X11/xorg.conf.d/40-Keyboard.conf" ]; then
     2.9 +		echo "Configuring Xorg server..." && HOME="/root" 
    2.10 +		tazx init
    2.11 +	fi
    2.12  	/etc/init.d/$LOGIN_MANAGER start >/dev/null &
    2.13  fi
    2.14  
     3.1 --- a/rootfs/etc/init.d/system.sh	Thu May 01 09:53:34 2014 +0200
     3.2 +++ b/rootfs/etc/init.d/system.sh	Thu May 01 17:33:55 2014 +0200
     3.3 @@ -42,9 +42,3 @@
     3.4  	echo "Syncing system time..."
     3.5  	ntpd -q -p ${$NTPD_HOST}; status
     3.6  fi
     3.7 -
     3.8 -# We need Xorg 40-Keyboard.conf and SliTaz applications.conf
     3.9 -if [ ! -s "/etc/X11/xorg.conf" ] && [ -x "/usr/bin/Xorg" ]; then
    3.10 -	echo "Configuring Xorg server..." && 
    3.11 -	HOME="/root" tazx init
    3.12 -fi
     4.1 --- a/rpi/tazberry	Thu May 01 09:53:34 2014 +0200
     4.2 +++ b/rpi/tazberry	Thu May 01 17:33:55 2014 +0200
     4.3 @@ -355,7 +355,7 @@
     4.4  		--gauge "" 8 ${width} 0
     4.5  	
     4.6  	# Reboot ?
     4.7 -	reboot_ox \
     4.8 +	reboot_box \
     4.9  		"$(gettext 'SliTaz is configured for the PiCam but you need a reboot to use it.')"
    4.10  }
    4.11