tazpanel rev 490

boot.cgi: fix partition list
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue May 12 16:26:58 2015 +0200 (2015-05-12)
parents df54c758feb8
children 8d914318cb3a
files boot.cgi
line diff
     1.1 --- a/boot.cgi	Tue May 12 15:05:51 2015 +0300
     1.2 +++ b/boot.cgi	Tue May 12 16:26:58 2015 +0200
     1.3 @@ -422,10 +422,11 @@
     1.4  			<option value="/dev/null">Choose a partition (optional)</option>
     1.5  EOT
     1.6  		blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \
     1.7 -		sed 's|^/dev/\(.*\):.*LABEL="\([^"]*\).* TYPE="\([^"]*\).*|\1 "\2" \3|' | \
     1.8 +		sed -e 's|[A-Z]*ID="[^"]*"||g;s| SEC[^ ]*||;s|LABEL=||;s|:||' \
     1.9 +		    -e 's|TYPE="\([^"]*\)"|\1|;s|/dev/||' | \
    1.10  		while read dev label type; do
    1.11 -			echo -n "<option value=\"/dev/$dev\">/dev/$dev $label "
    1.12 -			echo "$(blk2h < /sys/block/${dev:0:3}/$dev/size) $type</option>"
    1.13 +			echo -n "<option value=\"/dev/$dev\">/dev/$dev $label $type "
    1.14 +			echo "$(blk2h < /sys/block/${dev:0:3}/$dev/size)</option>"
    1.15  		done 
    1.16  		cat <<EOT
    1.17  			</select></td></tr>