# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1513870151 -3600
# Node ID ffb5734bba5fc22f68106fe425182a7c11dbc1c8
# Parent  fb585e9d299af928c4df7d7e05a910d27021877e
hardware.cgi: /dev/mapper/ disks support

diff -r fb585e9d299a -r ffb5734bba5f hardware.cgi
--- a/hardware.cgi	Tue Dec 19 20:36:00 2017 +0100
+++ b/hardware.cgi	Thu Dec 21 16:29:11 2017 +0100
@@ -21,7 +21,7 @@
 
 disk_info() {
 	fdisk -l | fgrep Disk | while read a b c; do
-		d=${b#/dev/}
+		d=${b##*/}
 		t="HD"
 		[ "$(cat /sys/block/${d%:}/queue/rotational)" -eq "0" ] && t="SSD"
 		d="/sys/block/${d%:}/device"
@@ -441,29 +441,29 @@
 
 			# size
 			[ -z "$size" ] &&
-			size="$(blk2h $(cat /sys/block/${fs#/dev/}/size /sys/block/*/${fs#/dev/}/size))"
+			size="$(blk2h $(cat /sys/block/${fs##*/}/size /sys/block/*/${fs##*/}/size))"
 
 			# image
 			disktype="@hdd@"
-			case "$(cat /sys/block/${fs#/dev/}/removable 2>/dev/null ||
+			case "$(cat /sys/block/${fs##*/}/removable 2>/dev/null ||
 				cat /sys/block/${fs:5:3}/removable 2>/dev/null)" in
 			1) disktype="@removable@" ;;
 			esac
-			case "$(cat /sys/block/${fs#/dev/}/ro 2>/dev/null ||
+			case "$(cat /sys/block/${fs##*/}/ro 2>/dev/null ||
 				cat /sys/block/${fs:5:3}/ro 2>/dev/null)" in
 			1) disktype="@cd@" ;;
 			esac
 
 			# boot flag
-			dsk="${fs#/dev/}"
+			dsk="${fs##*/}"
 			case " $bootdevs " in *\ $fs\ *) dsk="<i>$dsk</i>";; esac
 
-			radio="<input type=\"radio\" name=\"device\" value=\"$action $fs\" id=\"${fs#/dev/}\"/>"
+			radio="<input type=\"radio\" name=\"device\" value=\"$action $fs\" id=\"${fs##*/}\"/>"
 			[ "$REMOTE_USER" == "root" ] || radio=""
 			cat <<EOT
 			<tr>
 				<td>$radio<!--
-					--><label for="${fs#/dev/}" data-icon="$disktype">&thinsp;$dsk</label></td>
+					--><label for="${fs##*/}" data-icon="$disktype">&thinsp;$dsk</label></td>
 				<td>$(blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
 				<td>$type</td>
 				<td>$size</td>
@@ -562,7 +562,7 @@
 			<tbody>
 EOT
 for devloop in $(ls /dev/*loop[0-9]*); do
-	loop="${devloop#/dev/}"
+	loop="${devloop##*/}"
 	dir=/sys/block/$loop
 	case "$(cat $dir/ro 2>/dev/null)" in
 	0) ro="$(_ "read/write")" ;;