# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1431440818 -7200
# Node ID 2874c858a6b2dccdd1bee4e5c57a987b987e3cd8
# Parent  df54c758feb849036b0df149c4c0a71ae02afc6d
boot.cgi: fix partition list

diff -r df54c758feb8 -r 2874c858a6b2 boot.cgi
--- a/boot.cgi	Tue May 12 15:05:51 2015 +0300
+++ b/boot.cgi	Tue May 12 16:26:58 2015 +0200
@@ -422,10 +422,11 @@
 			<option value="/dev/null">Choose a partition (optional)</option>
 EOT
 		blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \
-		sed 's|^/dev/\(.*\):.*LABEL="\([^"]*\).* TYPE="\([^"]*\).*|\1 "\2" \3|' | \
+		sed -e 's|[A-Z]*ID="[^"]*"||g;s| SEC[^ ]*||;s|LABEL=||;s|:||' \
+		    -e 's|TYPE="\([^"]*\)"|\1|;s|/dev/||' | \
 		while read dev label type; do
-			echo -n "<option value=\"/dev/$dev\">/dev/$dev $label "
-			echo "$(blk2h < /sys/block/${dev:0:3}/$dev/size) $type</option>"
+			echo -n "<option value=\"/dev/$dev\">/dev/$dev $label $type "
+			echo "$(blk2h < /sys/block/${dev:0:3}/$dev/size)</option>"
 		done 
 		cat <<EOT
 			</select></td></tr>