# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1396631055 -7200
# Node ID ba52d096f50ffb9f5be2f5ed782614457522c733
# Parent  d670034c1f005470b9609b1a0d7dc0bb545c04bc
Improve tazberry, prepa for running post_install on first boot

diff -r d670034c1f00 -r ba52d096f50f cgi-adm/tools.cgi
--- a/cgi-adm/tools.cgi	Tue Apr 01 23:09:04 2014 +0200
+++ b/cgi-adm/tools.cgi	Fri Apr 04 19:04:15 2014 +0200
@@ -42,7 +42,7 @@
 	do
 		. ${plugins}/${p}/${p}.conf
 	cat << EOT
-<div><b><a href="$script?$p">$p</a></b></div>
+<div><b><a href="$script?$p">$PLUGIN</a></b></div>
 <pre>
 Description : $SHORT_DESC
 Website     : <a href="$WEB_SITE">${WEB_SITE#http://}</a>
@@ -70,19 +70,12 @@
 CPU usage    : $(top -n 1 | fgrep CPU: | awk '{print $4}')
 </pre>
 
-<pre>
-Filesystem                Size      Used Available Use% Mounted on
---------------------------------------------------------------------------------
-$(df -h | grep ^/dev)
-</pre>
-
 <div id="actions">
 	<form method="get" action="$script">
 		<input type="submit" name="reboot" value="Reboot system" />
 		<input type="submit" name="halt" value="Halt system" />
 	</form>
 </div>
-
 EOT
 }
 
diff -r d670034c1f00 -r ba52d096f50f flavors/rpi-desktop/flavor.conf
--- a/flavors/rpi-desktop/flavor.conf	Tue Apr 01 23:09:04 2014 +0200
+++ b/flavors/rpi-desktop/flavor.conf	Fri Apr 04 19:04:15 2014 +0200
@@ -2,7 +2,7 @@
 #
 
 FLAVOR="rpi-desktop"
-VERSION="20140304"
+VERSION="20140402"
 MAINTAINER="pankso@slitaz.org"
 SHORT_DESC="SliTaz ARM Raspberry Pi Desktop"
 WEB_SITE="http://arm.slitaz.org"
diff -r d670034c1f00 -r ba52d096f50f flavors/rpi-desktop/packages.list
--- a/flavors/rpi-desktop/packages.list	Tue Apr 01 23:09:04 2014 +0200
+++ b/flavors/rpi-desktop/packages.list	Fri Apr 04 19:04:15 2014 +0200
@@ -99,3 +99,7 @@
 calculator
 links
 slim
+alsa-lib
+libltdl
+alsa-utils
+mpg123
diff -r d670034c1f00 -r ba52d096f50f rootfs/etc/init.d/rcS
--- a/rootfs/etc/init.d/rcS	Tue Apr 01 23:09:04 2014 +0200
+++ b/rootfs/etc/init.d/rcS	Fri Apr 04 19:04:15 2014 +0200
@@ -68,6 +68,11 @@
 	#[ -s /etc/locale.conf ] || tazlocale
 	slitaz-config root_passwd
 	# add a user: slitaz-config add_user
+	# Run packages post_install since when we generate a distro from
+	# an i486 machine we can't chroot and run ARM binaries. If we dont
+	# run some post_install we will miss gtk icon, pango modules, etc...
+	# echo "Configuring all SliTaz packages..."
+	# spk reconf --all
 fi
 
 # Load all modules from config file
diff -r d670034c1f00 -r ba52d096f50f rpi/tazberry
--- a/rpi/tazberry	Tue Apr 01 23:09:04 2014 +0200
+++ b/rpi/tazberry	Fri Apr 04 19:04:15 2014 +0200
@@ -153,16 +153,15 @@
 		--cancel-label "Quit" \
 		--menu "" ${height} ${width} 14 \
 "rpi-stats"      "$(gettext 'Show some RPi system stats')" \
-"cmdline.txt"    "$(gettext 'View boot args /boot/cmdline.txt')" \
-"config.txt"     "$(gettext 'View config file /boot/config.txt')" \
+"boot-cmdline"   "$(gettext 'View boot args /boot/cmdline.txt')" \
+"boot-config"    "$(gettext 'View config file /boot/config.txt')" \
 "rpi-turbo"      "$(gettext 'Enable or disable RPi turbo on next boot')" \
 "oclock"         "$(gettext 'Overclocking information and config')" \
-"packages"       "$(gettext 'Packages info and upgrade (spk)')" \
-"keyboard"       "$(gettext 'System keyboard setting')" \
-"root-passwd"    "$(gettext 'Change root password')" \
+"packages"       "$(gettext 'Spk packages manager')" \
+"config"         "$(gettext 'System config (lang, keyboard)')" \
 "reboot"         "$(gettext 'Reboot SliTaz')" \
 "halt"           "$(gettext 'Halt the Raspberry Pi')" \
-"quit"           "$(gettext 'Exit from TazBerry tool')" 2>${tmp}
+"quit"           "$(gettext 'Exit TazBerry tool')" 2>${tmp}
 	
 	# Handle options
 	opt=${?}
@@ -175,9 +174,9 @@
 	case "$action" in
 		rpi-stats)
 			msg_box "RPi Stats" "$(rpi_stats)" ;;
-		cmdline.txt)
+		boot-cmdline)
 			text_box /boot/cmdline.txt ;;
-		config.txt)
+		boot-config)
 			text_box ${config} ;;
 		rpi-turbo)
 			rpi_turbo && newline 
@@ -185,13 +184,11 @@
 		oclock)
 			oclock_box ;;
 		packages)
-			pkgs_box ;;
-		keyboard)
-			tazkeymap ;;
+			spk-dialog ;;
+		config)
+			slitaz-config ;;
 		reboot)
 			reboot ;;
-		root-passwd)
-			slitaz-config root_passwd ;;
 		halt)
 			halt ;;
 		quit)