SliTaz Repositories

     1.1 --- a/hardware.cgi	Sun Jun 23 16:55:26 2013 +0300
     1.2 +++ b/hardware.cgi	Sat Jun 29 21:29:35 2013 +0200
     1.3 @@ -12,27 +12,6 @@
     1.4  
     1.5  TITLE=$(gettext 'TazPanel - Hardware')
     1.6  
     1.7 -ktoh()
     1.8 -{
     1.9 -	k=$1
    1.10 -	if [ $k -lt 1024 ]; then
    1.11 -		eval_gettext '${k}K'
    1.12 -		return
    1.13 -	fi
    1.14 -	k=$((($k+512)/1024))
    1.15 -	if [ $k -lt 1024 ]; then
    1.16 -		eval_gettext '${k}M'
    1.17 -		return
    1.18 -	fi
    1.19 -	k=$((($k+512)/1024))
    1.20 -	if [ $k -lt 1024 ]; then
    1.21 -		eval_gettext '${k}G'
    1.22 -		return
    1.23 -	fi
    1.24 -	k=$((($k+512)/1024))
    1.25 -	eval_gettext '${k}T'
    1.26 -}
    1.27 -
    1.28  lsusb_table()
    1.29  {
    1.30  	cat << EOT
    1.31 @@ -318,12 +297,14 @@
    1.32  			if grep -q "^$fs " /proc/swaps; then
    1.33  				action="swapoff"
    1.34  				set -- $(grep "^$fs " /proc/swaps)
    1.35 -				size=$(ktoh $3)
    1.36 -				used=$(ktoh $4)
    1.37 -				av=$(ktoh $(($3-$4)))
    1.38 +				size=$(blk2h $(($3*2)))
    1.39 +				used=$(blk2h $(($4*2)))
    1.40 +				av=$(blk2h $((2*($3-$4))))
    1.41  				pct=$(((100*$4)/$3))%
    1.42  				mp=swap
    1.43  			fi
    1.44 +			[ -z "$size" ] &&
    1.45 +			size="$(blk2h $(cat /sys/block/${fs#/dev/}/size /sys/block/*/${fs#/dev/}/size))"
    1.46  			cat << EOT
    1.47  <tr>
    1.48  	<td><input type="radio" name="device" value="$action $fs" />