# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1395158607 -3600
# Node ID de766d155dae8eb7b09a0e2e8a7c88ff5cc080b0
# Parent  e4d89b2237c7a24408834ac083e83d04362498ea
Improve JWM menus /root/.xsession is generated by tazx

diff -r e4d89b2237c7 -r de766d155dae flavors/rpi-base/packages.list
--- a/flavors/rpi-base/packages.list	Mon Mar 17 22:26:48 2014 +0100
+++ b/flavors/rpi-base/packages.list	Tue Mar 18 17:03:27 2014 +0100
@@ -24,3 +24,10 @@
 joe
 clex
 lynx
+kmod
+pciids
+usbids
+udev
+acl
+attr
+liblzma
diff -r e4d89b2237c7 -r de766d155dae rootfs/etc/xdg/jwm/system.jwmrc
--- a/rootfs/etc/xdg/jwm/system.jwmrc	Mon Mar 17 22:26:48 2014 +0100
+++ b/rootfs/etc/xdg/jwm/system.jwmrc	Tue Mar 18 17:03:27 2014 +0100
@@ -3,34 +3,28 @@
 <JWM>
 
 	<!-- The root menu, if this is undefined you will not get a menu. -->
-	<!-- Additional RootMenu attributes: onroot, labeled, label -->
 	<RootMenu height="22" onroot="12">
+		<Menu icon="applications-accessories.png" label="Accessories">
+			<Program icon="galculator.png" label="Calculator">calculator</Program>
+			<Program icon="gnome-screenshot.png" label="Screenshot">shutterbug</Program>
+			<Program icon="text-editor.png" label="Joe Editor">terminal -e joe</Program>
+		</Menu>
 		<Menu icon="applications-system.png" label="System Tools">
-			<Program icon="applications-other.png" label="Xload Monitor">
-				xload -nolabel -bg black -fg grey -hl orange
-			</Program>
-			<Program icon="utilities-system-monitor.png" label="Top Monitor">
-				terminal -e top
-			</Program>
-			<Program icon="preferences-desktop-locale.png" label="System Config">
-				terminal -e su -c slitaz-config
-			</Program>
+			<Program icon="utilities-system-monitor.png" label="Top Monitor">terminal -e top</Program>
+			<Program icon="preferences-desktop-locale.png" label="System Config">terminal -e 'su -c slitaz-config'</Program>
 		</Menu>
 		<Menu icon="applications-internet.png" label="Network">
-			<Program icon="internet-web-browser.png" label="Lynx Web browser">
-				terminal -e lynx
-			</Program>
-			<Program icon="xchat.png" label="TazIRC IRC client">
-				terminal -e 'tazirc --ask'
-			</Program>
+			<Program icon="links.png" label="Links Web browser">links -g</Program>
+			<Program icon="internet-web-browser.png" label="Lynx Web browser">terminal -e lynx</Program>
+			<Program icon="xchat.png" label="TazIRC IRC client">terminal -e 'tazirc --ask'</Program>
 		</Menu>
-		<Program icon="tazpkg.png" label="Packages manager">terminal -e tazpkg shell</Program>
-		<Program icon="text-editor.png" label="Joe Text editor">terminal -e joe</Program>
+		<Program icon="file-manager.png" label="File manager">PathFinder</Program>
+		<Program icon="text-editor.png" label="Text editor">adie</Program>
 		<Program icon="xterm.png" label="Terminal">terminal</Program>
 	</RootMenu>
 	
 	<RootMenu height="22" onroot="3">
-		<Program icon="system-shut-down.png" label="Shut down system">reboot</Program>
+		<Program icon="system-shut-down.png" label="Shut down system">halt</Program>
 		<Program icon="system-restart.png" label="Reboot system">reboot</Program>
 		<Exit label="Exit JWM" confirm="true" icon="system-suspend.png"/>
 		<Restart label="Restart JWM" icon="system-restart.png"/>
diff -r e4d89b2237c7 -r de766d155dae rootfs/root/.xsession
--- a/rootfs/root/.xsession	Mon Mar 17 22:26:48 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# ~/.xsession: Start X window session manually on your system (startx).
-#
-Xorg &
-#xterm &
-exec jwm
diff -r e4d89b2237c7 -r de766d155dae rootfs/usr/share/pixmaps/file-manager.png
Binary file rootfs/usr/share/pixmaps/file-manager.png has changed
diff -r e4d89b2237c7 -r de766d155dae rpi/rootfs/etc/fstab
--- a/rpi/rootfs/etc/fstab	Mon Mar 17 22:26:48 2014 +0100
+++ b/rpi/rootfs/etc/fstab	Tue Mar 18 17:03:27 2014 +0100
@@ -5,4 +5,4 @@
 tmpfs             /dev/shm    tmpfs    defaults             0    0
 /dev/mmcblk0p1    /boot       vfat     noatime              1    2
 /dev/mmcblk0p2    swap        swap     defaults             0    0
-/dev/mmcblk0p3    /           btrfs    noatime              0    1
+/dev/mmcblk0p3    /           auto     noatime              0    1
diff -r e4d89b2237c7 -r de766d155dae tools/mksd.sh
--- a/tools/mksd.sh	Mon Mar 17 22:26:48 2014 +0100
+++ b/tools/mksd.sh	Tue Mar 18 17:03:27 2014 +0100
@@ -2,14 +2,19 @@
 #
 # Sleep to avoid: "kernel still uses old table: Device or resource busy"
 #
+# TODO: handle part number: --part=3 since Raspberry Pi need 3 part with
+# a first FAT32 and Cubie Board only 2 (with / swap) or 1 single part.
+#
 . /lib/libtaz.sh
 check_root
 
-if [ ! "$dev" ]; then
-	echo "Missing: --dev= cmdline option" && exit 1
+dev="$1"
+[ ! "$dev" ] && echo "Missing device name: $0 dev" && exit 1
+if ! fdisk -l | grep -q "/dev/${dev}"; then
+	echo "Unable to find: /dev/${dev}"; exit 1
 fi
 
-# Boot
+# Boot: min 33Mb for FAT32
 echo -n "Creating partition: /dev/${dev}1 /boot"
 fdisk /dev/${dev} >/dev/null << EOF
 o
@@ -17,7 +22,7 @@
 p
 1
 1
-+140M
++40M
 w
 EOF
 status
@@ -58,16 +63,25 @@
 EOF
 status
 
-# Mkfs 2>&1 >/dev/null
-#if fdisk -l /dev/${dev} | grep "^/dev/${dev}1"; then
-	#debug "Creating: /boot FAT32 filesystem"
-	#mkdosfs -F 32 -v -l -n "RPi-boot" /dev/${dev}1 
-#fi
-#if fdisk -l /dev/${dev} | grep "^/dev/${dev}2"; then
-	#debug "Creating: swap memory filesystem"
-	#mkswap -L "RPi-swap" /dev/${dev}2
-#fi
-#if fdisk -l /dev/${dev} | grep "^/dev/${dev}3"; then
-	#debug "Creating: root ext4 filesystem"
-	#mkfs.ext4 -L "RPi-root" /dev/${dev}3
-#fi
+[ "$nofs" ] && exit 0
+
+# Mkfs: Buggy fat32
+if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}1"; then
+	echo -n "Creating: /boot FAT32 filesystem"
+	mkfs.fat -v -F32 -I -n "           " /dev/${dev}1 \
+		2>>/tmp/mksd.log >/tmp/mksd.log; status
+fi
+if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}2"; then
+	echo -n "Creating: swap memory filesystem"
+	mkswap /dev/${dev}2 >>/tmp/mksd.log; status
+fi
+if fdisk -l /dev/${dev} | grep -q "^/dev/${dev}3"; then
+	fs="ext4"
+	[ "$btrfs" ] && fs="btrfs -f" 
+	echo -n "Creating: root $fs filesystem"
+	mkfs.${fs} -L "SliTazSD" /dev/${dev}3 \
+		2>>/tmp/mksd.log >>/tmp/mksd.log
+	status
+fi
+
+exit 0