slitaz-arm rev 88
Improve tazberry, prepa for running post_install on first boot
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Fri Apr 04 19:04:15 2014 +0200 (2014-04-04) |
| parents | d670034c1f00 |
| children | 055bf0ee633d |
| files | cgi-adm/tools.cgi flavors/rpi-desktop/flavor.conf flavors/rpi-desktop/packages.list rootfs/etc/init.d/rcS rpi/tazberry |
line diff
1.1 --- a/cgi-adm/tools.cgi Tue Apr 01 23:09:04 2014 +0200 1.2 +++ b/cgi-adm/tools.cgi Fri Apr 04 19:04:15 2014 +0200 1.3 @@ -42,7 +42,7 @@ 1.4 do 1.5 . ${plugins}/${p}/${p}.conf 1.6 cat << EOT 1.7 -<div><b><a href="$script?$p">$p</a></b></div> 1.8 +<div><b><a href="$script?$p">$PLUGIN</a></b></div> 1.9 <pre> 1.10 Description : $SHORT_DESC 1.11 Website : <a href="$WEB_SITE">${WEB_SITE#http://}</a> 1.12 @@ -70,19 +70,12 @@ 1.13 CPU usage : $(top -n 1 | fgrep CPU: | awk '{print $4}') 1.14 </pre> 1.15 1.16 -<pre> 1.17 -Filesystem Size Used Available Use% Mounted on 1.18 --------------------------------------------------------------------------------- 1.19 -$(df -h | grep ^/dev) 1.20 -</pre> 1.21 - 1.22 <div id="actions"> 1.23 <form method="get" action="$script"> 1.24 <input type="submit" name="reboot" value="Reboot system" /> 1.25 <input type="submit" name="halt" value="Halt system" /> 1.26 </form> 1.27 </div> 1.28 - 1.29 EOT 1.30 } 1.31
2.1 --- a/flavors/rpi-desktop/flavor.conf Tue Apr 01 23:09:04 2014 +0200 2.2 +++ b/flavors/rpi-desktop/flavor.conf Fri Apr 04 19:04:15 2014 +0200 2.3 @@ -2,7 +2,7 @@ 2.4 # 2.5 2.6 FLAVOR="rpi-desktop" 2.7 -VERSION="20140304" 2.8 +VERSION="20140402" 2.9 MAINTAINER="pankso@slitaz.org" 2.10 SHORT_DESC="SliTaz ARM Raspberry Pi Desktop" 2.11 WEB_SITE="http://arm.slitaz.org"
3.1 --- a/flavors/rpi-desktop/packages.list Tue Apr 01 23:09:04 2014 +0200 3.2 +++ b/flavors/rpi-desktop/packages.list Fri Apr 04 19:04:15 2014 +0200 3.3 @@ -99,3 +99,7 @@ 3.4 calculator 3.5 links 3.6 slim 3.7 +alsa-lib 3.8 +libltdl 3.9 +alsa-utils 3.10 +mpg123
4.1 --- a/rootfs/etc/init.d/rcS Tue Apr 01 23:09:04 2014 +0200 4.2 +++ b/rootfs/etc/init.d/rcS Fri Apr 04 19:04:15 2014 +0200 4.3 @@ -68,6 +68,11 @@ 4.4 #[ -s /etc/locale.conf ] || tazlocale 4.5 slitaz-config root_passwd 4.6 # add a user: slitaz-config add_user 4.7 + # Run packages post_install since when we generate a distro from 4.8 + # an i486 machine we can't chroot and run ARM binaries. If we dont 4.9 + # run some post_install we will miss gtk icon, pango modules, etc... 4.10 + # echo "Configuring all SliTaz packages..." 4.11 + # spk reconf --all 4.12 fi 4.13 4.14 # Load all modules from config file
5.1 --- a/rpi/tazberry Tue Apr 01 23:09:04 2014 +0200 5.2 +++ b/rpi/tazberry Fri Apr 04 19:04:15 2014 +0200 5.3 @@ -153,16 +153,15 @@ 5.4 --cancel-label "Quit" \ 5.5 --menu "" ${height} ${width} 14 \ 5.6 "rpi-stats" "$(gettext 'Show some RPi system stats')" \ 5.7 -"cmdline.txt" "$(gettext 'View boot args /boot/cmdline.txt')" \ 5.8 -"config.txt" "$(gettext 'View config file /boot/config.txt')" \ 5.9 +"boot-cmdline" "$(gettext 'View boot args /boot/cmdline.txt')" \ 5.10 +"boot-config" "$(gettext 'View config file /boot/config.txt')" \ 5.11 "rpi-turbo" "$(gettext 'Enable or disable RPi turbo on next boot')" \ 5.12 "oclock" "$(gettext 'Overclocking information and config')" \ 5.13 -"packages" "$(gettext 'Packages info and upgrade (spk)')" \ 5.14 -"keyboard" "$(gettext 'System keyboard setting')" \ 5.15 -"root-passwd" "$(gettext 'Change root password')" \ 5.16 +"packages" "$(gettext 'Spk packages manager')" \ 5.17 +"config" "$(gettext 'System config (lang, keyboard)')" \ 5.18 "reboot" "$(gettext 'Reboot SliTaz')" \ 5.19 "halt" "$(gettext 'Halt the Raspberry Pi')" \ 5.20 -"quit" "$(gettext 'Exit from TazBerry tool')" 2>${tmp} 5.21 +"quit" "$(gettext 'Exit TazBerry tool')" 2>${tmp} 5.22 5.23 # Handle options 5.24 opt=${?} 5.25 @@ -175,9 +174,9 @@ 5.26 case "$action" in 5.27 rpi-stats) 5.28 msg_box "RPi Stats" "$(rpi_stats)" ;; 5.29 - cmdline.txt) 5.30 + boot-cmdline) 5.31 text_box /boot/cmdline.txt ;; 5.32 - config.txt) 5.33 + boot-config) 5.34 text_box ${config} ;; 5.35 rpi-turbo) 5.36 rpi_turbo && newline 5.37 @@ -185,13 +184,11 @@ 5.38 oclock) 5.39 oclock_box ;; 5.40 packages) 5.41 - pkgs_box ;; 5.42 - keyboard) 5.43 - tazkeymap ;; 5.44 + spk-dialog ;; 5.45 + config) 5.46 + slitaz-config ;; 5.47 reboot) 5.48 reboot ;; 5.49 - root-passwd) 5.50 - slitaz-config root_passwd ;; 5.51 halt) 5.52 halt ;; 5.53 quit)