# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1359803924 -3600
# Node ID 2983cb632d9f4df1c793ad6543fc05006873406a
# Parent  eb07c27b27335d3c38c9fb064081a9517afcdf63
hardware.cgi: display UUID

diff -r eb07c27b2733 -r 2983cb632d9f hardware.cgi
--- a/hardware.cgi	Sun Jan 27 13:26:25 2013 -0200
+++ b/hardware.cgi	Sat Feb 02 12:18:44 2013 +0100
@@ -214,19 +214,37 @@
 EOT
 		df_thead
 		echo '<tbody>'
-		df -h | grep ^/dev | while read fs size used av pct mp
+		blkid | sort | while read dev misc
 		do
-				cat << EOT
+			fs=${dev%:}
+			set --
+			df | grep -q "^$fs " && set -- $(df -h | grep "^$fs ")
+			size=$2
+			used=$3
+			av=$4
+			pct=$5
+			mp=$6
+			cat << EOT
 <tr>
 	<td><img src="$IMAGES/harddisk.png" />${fs#/dev/}</td>
-	<td>$(blkid -o value $fs | head -n1)</td>
-	<td>$(blkid -o value $fs | tail -n1)</td>
+	<td>$(blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
+	<td>$(blkid $fs | sed '/TYPE=/!d;s/.*TYPE="\([^"]*\).*/\1/')</td>
 	<td>$size</td>
 	<td>$av</td>
+EOT
+		if [ -n "$pct" ]; then
+			cat << EOT
 	<td class="meter"><meter min="0" max="100" value="${pct%%%}" low="70"
 	high="90" optimum="10"></meter>
 		<span>$used - $pct</span>
 	</td>
+EOT
+		else
+			cat << EOT
+	<td></td>
+EOT
+		fi
+		cat << EOT
 	<td>$mp</td>
 </tr>
 EOT
diff -r eb07c27b2733 -r 2983cb632d9f index.cgi
--- a/index.cgi	Sun Jan 27 13:26:25 2013 -0200
+++ b/index.cgi	Sat Feb 02 12:18:44 2013 +0100
@@ -397,8 +397,8 @@
 <tr>
 	<td><a href="hardware.cgi">
 		<img src="$IMAGES/harddisk.png" />${fs#/dev/}</a></td>
-	<td>$(blkid -o value $fs | head -n1)</td>
-	<td>$(blkid -o value $fs | tail -n1)</td>
+	<td>$(blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
+	<td>$(blkid $fs | sed '/TYPE=/!d;s/.*TYPE="\([^"]*\).*/\1/')</td>
 	<td>$size</td>
 	<td>$av</td>
 	<td class="meter"><meter min="0" max="100" value="$(echo $pct | cut -d% -f1)"
@@ -406,6 +406,7 @@
 		<span>$used - $pct</span>
 	</td>
 	<td>$mp</td>
+	<td>$(blkid $fs | sed '/UUID=/!d;s/.*UUID="\([^"]*\).*/\1/')</td>
 </tr>
 EOT
 		done
diff -r eb07c27b2733 -r 2983cb632d9f lib/libtazpanel
--- a/lib/libtazpanel	Sun Jan 27 13:26:25 2013 -0200
+++ b/lib/libtazpanel	Sat Feb 02 12:18:44 2013 +0100
@@ -222,6 +222,7 @@
 		<td>$(gettext 'Available')</td>
 		<td>$(gettext 'Used')</td>
 		<td>$(gettext 'Mount point')</td>
+		<td>UUID</td>
 	</tr>
 </thead>
 EOT