slitaz-arm rev 70
Improve JWM menus /root/.xsession is generated by tazx
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Tue Mar 18 17:03:27 2014 +0100 (2014-03-18) |
| parents | e4d89b2237c7 |
| children | 62be4ce5a844 |
| files | flavors/rpi-base/packages.list rootfs/etc/xdg/jwm/system.jwmrc rootfs/root/.xsession rootfs/usr/share/pixmaps/file-manager.png rpi/rootfs/etc/fstab tools/mksd.sh |
line diff
1.1 --- a/flavors/rpi-base/packages.list Mon Mar 17 22:26:48 2014 +0100 1.2 +++ b/flavors/rpi-base/packages.list Tue Mar 18 17:03:27 2014 +0100 1.3 @@ -24,3 +24,10 @@ 1.4 joe 1.5 clex 1.6 lynx 1.7 +kmod 1.8 +pciids 1.9 +usbids 1.10 +udev 1.11 +acl 1.12 +attr 1.13 +liblzma
2.1 --- a/rootfs/etc/xdg/jwm/system.jwmrc Mon Mar 17 22:26:48 2014 +0100 2.2 +++ b/rootfs/etc/xdg/jwm/system.jwmrc Tue Mar 18 17:03:27 2014 +0100 2.3 @@ -3,34 +3,28 @@ 2.4 <JWM> 2.5 2.6 <!-- The root menu, if this is undefined you will not get a menu. --> 2.7 - <!-- Additional RootMenu attributes: onroot, labeled, label --> 2.8 <RootMenu height="22" onroot="12"> 2.9 + <Menu icon="applications-accessories.png" label="Accessories"> 2.10 + <Program icon="galculator.png" label="Calculator">calculator</Program> 2.11 + <Program icon="gnome-screenshot.png" label="Screenshot">shutterbug</Program> 2.12 + <Program icon="text-editor.png" label="Joe Editor">terminal -e joe</Program> 2.13 + </Menu> 2.14 <Menu icon="applications-system.png" label="System Tools"> 2.15 - <Program icon="applications-other.png" label="Xload Monitor"> 2.16 - xload -nolabel -bg black -fg grey -hl orange 2.17 - </Program> 2.18 - <Program icon="utilities-system-monitor.png" label="Top Monitor"> 2.19 - terminal -e top 2.20 - </Program> 2.21 - <Program icon="preferences-desktop-locale.png" label="System Config"> 2.22 - terminal -e su -c slitaz-config 2.23 - </Program> 2.24 + <Program icon="utilities-system-monitor.png" label="Top Monitor">terminal -e top</Program> 2.25 + <Program icon="preferences-desktop-locale.png" label="System Config">terminal -e 'su -c slitaz-config'</Program> 2.26 </Menu> 2.27 <Menu icon="applications-internet.png" label="Network"> 2.28 - <Program icon="internet-web-browser.png" label="Lynx Web browser"> 2.29 - terminal -e lynx 2.30 - </Program> 2.31 - <Program icon="xchat.png" label="TazIRC IRC client"> 2.32 - terminal -e 'tazirc --ask' 2.33 - </Program> 2.34 + <Program icon="links.png" label="Links Web browser">links -g</Program> 2.35 + <Program icon="internet-web-browser.png" label="Lynx Web browser">terminal -e lynx</Program> 2.36 + <Program icon="xchat.png" label="TazIRC IRC client">terminal -e 'tazirc --ask'</Program> 2.37 </Menu> 2.38 - <Program icon="tazpkg.png" label="Packages manager">terminal -e tazpkg shell</Program> 2.39 - <Program icon="text-editor.png" label="Joe Text editor">terminal -e joe</Program> 2.40 + <Program icon="file-manager.png" label="File manager">PathFinder</Program> 2.41 + <Program icon="text-editor.png" label="Text editor">adie</Program> 2.42 <Program icon="xterm.png" label="Terminal">terminal</Program> 2.43 </RootMenu> 2.44 2.45 <RootMenu height="22" onroot="3"> 2.46 - <Program icon="system-shut-down.png" label="Shut down system">reboot</Program> 2.47 + <Program icon="system-shut-down.png" label="Shut down system">halt</Program> 2.48 <Program icon="system-restart.png" label="Reboot system">reboot</Program> 2.49 <Exit label="Exit JWM" confirm="true" icon="system-suspend.png"/> 2.50 <Restart label="Restart JWM" icon="system-restart.png"/>
3.1 --- a/rootfs/root/.xsession Mon Mar 17 22:26:48 2014 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,5 +0,0 @@ 3.4 -# ~/.xsession: Start X window session manually on your system (startx). 3.5 -# 3.6 -Xorg & 3.7 -#xterm & 3.8 -exec jwm
4.1 Binary file rootfs/usr/share/pixmaps/file-manager.png has changed
5.1 --- a/rpi/rootfs/etc/fstab Mon Mar 17 22:26:48 2014 +0100 5.2 +++ b/rpi/rootfs/etc/fstab Tue Mar 18 17:03:27 2014 +0100 5.3 @@ -5,4 +5,4 @@ 5.4 tmpfs /dev/shm tmpfs defaults 0 0 5.5 /dev/mmcblk0p1 /boot vfat noatime 1 2 5.6 /dev/mmcblk0p2 swap swap defaults 0 0 5.7 -/dev/mmcblk0p3 / btrfs noatime 0 1 5.8 +/dev/mmcblk0p3 / auto noatime 0 1
6.1 --- a/tools/mksd.sh Mon Mar 17 22:26:48 2014 +0100 6.2 +++ b/tools/mksd.sh Tue Mar 18 17:03:27 2014 +0100 6.3 @@ -2,14 +2,19 @@ 6.4 # 6.5 # Sleep to avoid: "kernel still uses old table: Device or resource busy" 6.6 # 6.7 +# TODO: handle part number: --part=3 since Raspberry Pi need 3 part with 6.8 +# a first FAT32 and Cubie Board only 2 (with / swap) or 1 single part. 6.9 +# 6.10 . /lib/libtaz.sh 6.11 check_root 6.12 6.13 -if [ ! "$dev" ]; then 6.14 - echo "Missing: --dev= cmdline option" && exit 1 6.15 +dev="$1" 6.16 +[ ! "$dev" ] && echo "Missing device name: $0 dev" && exit 1 6.17 +if ! fdisk -l | grep -q "/dev/${dev}"; then 6.18 + echo "Unable to find: /dev/${dev}"; exit 1 6.19 fi 6.20 6.21 -# Boot 6.22 +# Boot: min 33Mb for FAT32 6.23 echo -n "Creating partition: /dev/${dev}1 /boot" 6.24 fdisk /dev/${dev} >/dev/null << EOF 6.25 o 6.26 @@ -17,7 +22,7 @@ 6.27 p 6.28 1 6.29 1 6.30 -+140M 6.31 ++40M 6.32 w 6.33 EOF 6.34 status 6.35 @@ -58,16 +63,25 @@ 6.36 EOF 6.37 status 6.38 6.39 -# Mkfs 2>&1 >/dev/null 6.40 -#if fdisk -l /dev/${dev} | grep "^/dev/${dev}1"; then 6.41 - #debug "Creating: /boot FAT32 filesystem" 6.42 - #mkdosfs -F 32 -v -l -n "RPi-boot" /dev/${dev}1 6.43 -#fi 6.44 -#if fdisk -l /dev/${dev} | grep "^/dev/${dev}2"; then 6.45 - #debug "Creating: swap memory filesystem" 6.46 - #mkswap -L "RPi-swap" /dev/${dev}2 6.47 -#fi 6.48 -#if fdisk -l /dev/${dev} | grep "^/dev/${dev}3"; then 6.49 - #debug "Creating: root ext4 filesystem" 6.50 - #mkfs.ext4 -L "RPi-root" /dev/${dev}3 6.51 -#fi 6.52 +[ "$nofs" ] && exit 0 6.53 + 6.54 +# Mkfs: Buggy fat32 6.55 +if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}1"; then 6.56 + echo -n "Creating: /boot FAT32 filesystem" 6.57 + mkfs.fat -v -F32 -I -n " " /dev/${dev}1 \ 6.58 + 2>>/tmp/mksd.log >/tmp/mksd.log; status 6.59 +fi 6.60 +if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}2"; then 6.61 + echo -n "Creating: swap memory filesystem" 6.62 + mkswap /dev/${dev}2 >>/tmp/mksd.log; status 6.63 +fi 6.64 +if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}3"; then 6.65 + fs="ext4" 6.66 + [ "$btrfs" ] && fs="btrfs -f" 6.67 + echo -n "Creating: root $fs filesystem" 6.68 + mkfs.${fs} -L "SliTazSD" /dev/${dev}3 \ 6.69 + 2>>/tmp/mksd.log >>/tmp/mksd.log 6.70 + status 6.71 +fi 6.72 + 6.73 +exit 0