SliTaz Repositories

     1.1 --- a/hardware.cgi	Mon Jul 29 20:45:13 2013 +0200
     1.2 +++ b/hardware.cgi	Sat Dec 21 21:40:29 2013 +0100
     1.3 @@ -272,6 +272,20 @@
     1.4  
     1.5  
     1.6  		#
     1.7 +		# Loop device management actions
     1.8 +		#
     1.9 +		device=$(GET loopdev)
    1.10 +		lib crypto $device
    1.11 +		case "$device" in
    1.12 +		/dev/loop*)
    1.13 +			set -- $(losetup | grep ^$device:)
    1.14 +			[ -n "$3" ] && losetup -d $device
    1.15 +			ro=""
    1.16 +			[ -n "$(GET readonly)" ] && ro="-r"
    1.17 +			file="$(GET backingfile)"
    1.18 +			[ -n "$file" ] && losetup -o $(GET offset) $ro $device $file
    1.19 +		esac
    1.20 +		#
    1.21  		# Disk stats and management (mount, umount, check)
    1.22  		#
    1.23  		device=$(GET device)
    1.24 @@ -291,7 +305,7 @@
    1.25  EOT
    1.26  		df_thead
    1.27  		echo '<tbody>'
    1.28 -		for fs in $(blkid | sort | sed 's/:.*//')
    1.29 +		for fs in $(blkid | sed 's/:.*//')
    1.30  		do
    1.31  			set -- $(df -h | grep "^$fs ")
    1.32  			size=$2
    1.33 @@ -367,8 +381,10 @@
    1.34  EOT
    1.35  
    1.36  grep -v '^#' /etc/fstab | awk 'BEGIN{print "<table class=\"zebra outbox\">\
    1.37 -	<thead><tr><td>spec</td><td>file</td><td>vfstype</td><td>mntops</td><td>\
    1.38 -	freq</td><td>passno</td></thead><tbody>"}{print "<tr><td>"$1"</td><td>"$2\
    1.39 +	<thead><tr><td>$(gettext 'Disk')</td><td>$(gettext 'Mount point')</td><td>\
    1.40 +	$(gettext 'Type')</td><td>$(gettext 'Options')</td><td>\
    1.41 +	$(gettext 'Freq')</td><td>$(gettext 'Pass')</td></thead><tbody>"}\
    1.42 +	{print "<tr><td>"$1"</td><td>"$2\
    1.43  	"</td><td>"$3"</td><td>"$4"</td><td>"$5"</td><td>"$6"</td></tr>"}
    1.44  	END{print "</tbody></table>"}'
    1.45  
    1.46 @@ -380,19 +396,8 @@
    1.47  <h3>$(gettext 'Loop devices')</h3>
    1.48  EOT
    1.49  		#
    1.50 -		# Loop device management
    1.51 +		# Loop device management gui
    1.52  		#
    1.53 -		device=$(GET loopdev)
    1.54 -		lib crypto $device
    1.55 -		case "$device" in
    1.56 -		/dev/loop*)
    1.57 -			set -- $(losetup | grep ^$device:)
    1.58 -			[ -n "$3" ] && losetup -d $device
    1.59 -			ro=""
    1.60 -			[ -n "$(GET readonly)" ] && ro="-r"
    1.61 -			file="$(GET backingfile)"
    1.62 -			[ -n "$file" ] && losetup -o $(GET offset) $ro $device $file
    1.63 -		esac
    1.64  		cat << EOT
    1.65  <form method="get" action="$SCRIPT_NAME#loop">
    1.66  <table id="loop" class="zebra outbox nowrap">