SliTaz Repositories

     1.1 --- a/hardware.cgi	Sun Jan 27 13:26:25 2013 -0200
     1.2 +++ b/hardware.cgi	Sat Feb 02 12:18:44 2013 +0100
     1.3 @@ -214,19 +214,37 @@
     1.4  EOT
     1.5  		df_thead
     1.6  		echo '<tbody>'
     1.7 -		df -h | grep ^/dev | while read fs size used av pct mp
     1.8 +		blkid | sort | while read dev misc
     1.9  		do
    1.10 -				cat << EOT
    1.11 +			fs=${dev%:}
    1.12 +			set --
    1.13 +			df | grep -q "^$fs " && set -- $(df -h | grep "^$fs ")
    1.14 +			size=$2
    1.15 +			used=$3
    1.16 +			av=$4
    1.17 +			pct=$5
    1.18 +			mp=$6
    1.19 +			cat << EOT
    1.20  <tr>
    1.21  	<td><img src="$IMAGES/harddisk.png" />${fs#/dev/}</td>
    1.22 -	<td>$(blkid -o value $fs | head -n1)</td>
    1.23 -	<td>$(blkid -o value $fs | tail -n1)</td>
    1.24 +	<td>$(blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
    1.25 +	<td>$(blkid $fs | sed '/TYPE=/!d;s/.*TYPE="\([^"]*\).*/\1/')</td>
    1.26  	<td>$size</td>
    1.27  	<td>$av</td>
    1.28 +EOT
    1.29 +		if [ -n "$pct" ]; then
    1.30 +			cat << EOT
    1.31  	<td class="meter"><meter min="0" max="100" value="${pct%%%}" low="70"
    1.32  	high="90" optimum="10"></meter>
    1.33  		<span>$used - $pct</span>
    1.34  	</td>
    1.35 +EOT
    1.36 +		else
    1.37 +			cat << EOT
    1.38 +	<td></td>
    1.39 +EOT
    1.40 +		fi
    1.41 +		cat << EOT
    1.42  	<td>$mp</td>
    1.43  </tr>
    1.44  EOT

     2.1 --- a/index.cgi	Sun Jan 27 13:26:25 2013 -0200
     2.2 +++ b/index.cgi	Sat Feb 02 12:18:44 2013 +0100
     2.3 @@ -397,8 +397,8 @@
     2.4  <tr>
     2.5  	<td><a href="hardware.cgi">
     2.6  		<img src="$IMAGES/harddisk.png" />${fs#/dev/}</a></td>
     2.7 -	<td>$(blkid -o value $fs | head -n1)</td>
     2.8 -	<td>$(blkid -o value $fs | tail -n1)</td>
     2.9 +	<td>$(blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
    2.10 +	<td>$(blkid $fs | sed '/TYPE=/!d;s/.*TYPE="\([^"]*\).*/\1/')</td>
    2.11  	<td>$size</td>
    2.12  	<td>$av</td>
    2.13  	<td class="meter"><meter min="0" max="100" value="$(echo $pct | cut -d% -f1)"
    2.14 @@ -406,6 +406,7 @@
    2.15  		<span>$used - $pct</span>
    2.16  	</td>
    2.17  	<td>$mp</td>
    2.18 +	<td>$(blkid $fs | sed '/UUID=/!d;s/.*UUID="\([^"]*\).*/\1/')</td>
    2.19  </tr>
    2.20  EOT
    2.21  		done

     3.1 --- a/lib/libtazpanel	Sun Jan 27 13:26:25 2013 -0200
     3.2 +++ b/lib/libtazpanel	Sat Feb 02 12:18:44 2013 +0100
     3.3 @@ -222,6 +222,7 @@
     3.4  		<td>$(gettext 'Available')</td>
     3.5  		<td>$(gettext 'Used')</td>
     3.6  		<td>$(gettext 'Mount point')</td>
     3.7 +		<td>UUID</td>
     3.8  	</tr>
     3.9  </thead>
    3.10  EOT