slitaz-arm rev 115
Use poweroff, tiny fixes to tazberry, work in progress on post-install.sh
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Mon Apr 21 02:07:47 2014 +0200 (2014-04-21) |
| parents | c4d8a7a5f97c |
| children | 3bffab5ac240 |
| files | flavors/pitft/packages.list flavors/rpi-base/packages.list flavors/rpi-desktop/packages.list rootfs/etc/init.d/post-install.sh rootfs/etc/xdg/jwm/menus.jwmrc rpi/tazberry |
line diff
1.1 --- a/flavors/pitft/packages.list Sat Apr 19 23:19:55 2014 +0200 1.2 +++ b/flavors/pitft/packages.list Mon Apr 21 02:07:47 2014 +0200 1.3 @@ -37,7 +37,6 @@ 1.4 kmod 1.5 liblzma 1.6 bzip2 1.7 -pciids 1.8 usbids 1.9 bzlib 1.10 freetype
2.1 --- a/flavors/rpi-base/packages.list Sat Apr 19 23:19:55 2014 +0200 2.2 +++ b/flavors/rpi-base/packages.list Mon Apr 21 02:07:47 2014 +0200 2.3 @@ -25,7 +25,6 @@ 2.4 clex 2.5 lynx 2.6 kmod 2.7 -pciids 2.8 usbids 2.9 udev 2.10 acl
3.1 --- a/flavors/rpi-desktop/packages.list Sat Apr 19 23:19:55 2014 +0200 3.2 +++ b/flavors/rpi-desktop/packages.list Mon Apr 21 02:07:47 2014 +0200 3.3 @@ -38,7 +38,6 @@ 3.4 kmod 3.5 liblzma 3.6 bzip2 3.7 -pciids 3.8 usbids 3.9 bzlib 3.10 freetype
4.1 --- a/rootfs/etc/init.d/post-install.sh Sat Apr 19 23:19:55 2014 +0200 4.2 +++ b/rootfs/etc/init.d/post-install.sh Mon Apr 21 02:07:47 2014 +0200 4.3 @@ -13,24 +13,72 @@ 4.4 fi 4.5 4.6 # Welcome/About 4.7 -slitaz-config about_post_install 4.8 +#slitaz-config about_post_install 4.9 4.10 -[ -s /etc/keymap.conf ] || tazkeymap 4.11 +#[ -s /etc/keymap.conf ] || tazkeymap 4.12 #[ -s /etc/locale.conf ] || tazlocale 4.13 4.14 -slitaz-config root_passwd 4.15 -slitaz-config add_user 4.16 +#slitaz-config root_passwd 4.17 +#slitaz-config add_user 4.18 #dialog --yesno "$user account was created. Do you want X autologin ?" 4.19 -#dialog --yesno "Do you wish to setup a network connection ?" 4.20 -#slitaz-config network_connection 4.21 + 4.22 +# Wireless ? 4.23 +#if ifconfig -a | grep "wlan[0-9]"; then 4.24 + #dialog --yesno "\nDo you wish to setup a Wi-Fi network connection ?" 10 72 4.25 + #opt=$? 4.26 + #echo $opt 4.27 + #[ "$?" == "0" ] && slitaz-config wifi_setup 4.28 +#fi 4.29 4.30 # No post install on next boot. 4.31 -mkdir -p /var/lib/slitaz 4.32 -echo "$ARCH" > /var/lib/slitaz/post-install 4.33 +#mkdir -p /var/lib/slitaz 4.34 +#echo "$ARCH" > /var/lib/slitaz/post-install 4.35 4.36 # Run packages post_install since when we generate a distro from 4.37 # an i486 machine we can't chroot and run ARM binaries. If we don't 4.38 # run some post_install we will miss gtk icon, pango modules, etc... 4.39 -clear && newline 4.40 -colorize 33 "Reconfiguring all SliTaz packages..." 4.41 -spk reconf --all 4.42 +# Keep it here since reconf can be run from cmdline and advanced users. 4.43 +# Anyway, after a this post install is finish everthing will be handle 4.44 +# by spk or tazpkg. 4.45 +# 4.46 +{ 4.47 + echo "XXX" && echo 0 4.48 + echo -e "\nPreparing packages config...\n" 4.49 + echo "XXX" && sleep 1 4.50 + db=/var/lib/tazpkg/installed 4.51 + installed=$(ls $db | wc -l) 4.52 + 4.53 + # Get the % alocated for 1 pkg and split % left 4.54 + echo "XXX" && echo 4 4.55 + echo -e "\nInstalled packages to check: \Zb\Z2$installed" 4.56 + echo "XXX" 4.57 + total=$(grep "^post_install" ${db}/*/receipt | wc -l) 4.58 + pkgpct=$((100 / ${total})) 4.59 + left=$((100 - (${pkgpct} * ${total}))) 4.60 + split=$((${left} / 2)) 4.61 + sleep 2 4.62 + 4.63 + # Show pkgs to configure a few sec 4.64 + echo "XXX" && echo ${split} 4.65 + echo -e "\nPackages to configure: \Zb\Z2$total" 4.66 + echo "XXX" && sleep 3 4.67 + 4.68 + # Lets run all thes post_install 4.69 + pct="$split" 4.70 + for pkg in ${db}/* 4.71 + do 4.72 + receipt="$installed/$pkg/receipt" 4.73 + [ ! -f "$receipt" ] && continue 4.74 + if grep -q ^post_install ${receipt}; then 4.75 + echo -e "\nConfiguring: $pkg" 4.76 + . ${receipt} 4.77 + #post_install 4.78 + #fi 4.79 + done 4.80 + 4.81 + echo "XXX" && echo 100 4.82 + echo -e "\nAll packages are configured... exiting" 4.83 + echo "XXX" && sleep 2 4.84 +} | dialog --title "{ Packages Post Install }" --colors --gauge "" 8 72 0 4.85 + 4.86 +exit 0
5.1 --- a/rootfs/etc/xdg/jwm/menus.jwmrc Sat Apr 19 23:19:55 2014 +0200 5.2 +++ b/rootfs/etc/xdg/jwm/menus.jwmrc Mon Apr 21 02:07:47 2014 +0200 5.3 @@ -58,7 +58,7 @@ 5.4 <Restart label="Restart JWM" icon="system-restart.png" /> 5.5 <Exit label="Exit JWM" confirm="true" icon="system-suspend.png" /> 5.6 <Program icon="system-restart.png" label="Reboot system">reboot</Program> 5.7 - <Program icon="system-shut-down.png" label="Shutdown system">halt</Program> 5.8 + <Program icon="system-shut-down.png" label="Shutdown system">poweroff</Program> 5.9 </RootMenu> 5.10 5.11 </JWM>
6.1 --- a/rpi/tazberry Sat Apr 19 23:19:55 2014 +0200 6.2 +++ b/rpi/tazberry Mon Apr 21 02:07:47 2014 +0200 6.3 @@ -89,7 +89,7 @@ 6.4 local file="$1" 6.5 if [ -f "$file" ]; then 6.6 dialog --cr-wrap \ 6.7 - --title " $(gettext 'Viewing file:') $file " \ 6.8 + --title "{ $(gettext 'Viewing file:') $file }" \ 6.9 --extra-button \ 6.10 --extra-label "Edit file" \ 6.11 --ok-label "TazBerry" \ 6.12 @@ -106,7 +106,7 @@ 6.13 6.14 # Usage: tail_box "file" 6.15 tail_box() { 6.16 - dialog --title " $(gettext 'Watching file:') $2 " \ 6.17 + dialog --title "{ $(gettext 'Watching file:') $2 }" \ 6.18 --tailbox "$1" ${height} ${width} 6.19 } 6.20 6.21 @@ -180,8 +180,8 @@ 6.22 "rpi-turbo" "$(gettext 'Enable or disable RPi turbo on next boot')" \ 6.23 "boot-cmdline" "$(gettext 'View boot args /boot/cmdline.txt')" \ 6.24 "boot-config" "$(gettext 'View config file /boot/config.txt')" \ 6.25 -"packages" "$(gettext 'Spk packages manager')" \ 6.26 -"config" "$(gettext 'System config (lang, keyboard)')" \ 6.27 +"packages" "$(gettext 'SliTaz packages manager') (spk)" \ 6.28 +"config" "$(gettext 'System config (lang, keyboard, wifi)')" \ 6.29 "reboot" "$(gettext 'Reboot SliTaz')" \ 6.30 "halt" "$(gettext 'Halt the Raspberry Pi')" \ 6.31 "quit" "$(gettext 'Exit TazBerry tool')" 2>${tmp} 6.32 @@ -218,7 +218,7 @@ 6.33 reboot) 6.34 reboot ;; 6.35 halt) 6.36 - halt ;; 6.37 + poweroff ;; 6.38 quit) 6.39 rm -rf ${tmpdir} && exit 0 ;; 6.40 esac