tazpanel diff boot.cgi @ rev 635
Use busybox blkid
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Sep 27 16:12:27 2020 +0000 (2020-09-27) |
parents | b932799f8ae1 |
children | cd2735c8e31b |
line diff
1.1 --- a/boot.cgi Sat Jul 06 15:03:14 2019 +0200 1.2 +++ b/boot.cgi Sun Sep 27 16:12:27 2020 +0000 1.3 @@ -418,7 +418,7 @@ 1.4 <td><select name="instdev"> 1.5 <option value="/dev/null">$(_ 'Choose a partition (optional)')</option> 1.6 EOT 1.7 - blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \ 1.8 + busybox blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \ 1.9 sed -e 's|[A-Z]*ID="[^"]*"||g;s| SEC[^ ]*||;s|LABEL=||;s|:||' \ 1.10 -e 's|TYPE="\([^"]*\)"|\1|;s|/dev/||' | \ 1.11 while read dev label type; do 1.12 @@ -440,7 +440,7 @@ 1.13 echo -n "<option value=\"/dev/$dev\">/dev/$dev " 1.14 echo -n "$(blk2h < /sys/block/$dev/size) " 1.15 echo -n "$(cat /sys/block/$dev/device/model 2>/dev/null) " 1.16 - blkid | grep $dev | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/"\1"/;q' 1.17 + busybox blkid | grep $dev | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/"\1"/;q' 1.18 echo "</option>" 1.19 done 1.20 cat <<EOT