# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1601223147 0
# Node ID 8e4c1fe854622faf0decb6eda32dc9c401245917
# Parent  f4650547f49656dfd840a7d5e9e19d311690bb8b
Use busybox blkid

diff -r f4650547f496 -r 8e4c1fe85462 boot.cgi
--- a/boot.cgi	Thu Sep 24 11:14:22 2020 +0100
+++ b/boot.cgi	Sun Sep 27 16:12:27 2020 +0000
@@ -418,7 +418,7 @@
 		<td><select name="instdev">
 			<option value="/dev/null">$(_ 'Choose a partition (optional)')</option>
 EOT
-		blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \
+		busybox blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \
 		sed -e 's|[A-Z]*ID="[^"]*"||g;s| SEC[^ ]*||;s|LABEL=||;s|:||' \
 		    -e 's|TYPE="\([^"]*\)"|\1|;s|/dev/||' | \
 		while read dev label type; do
@@ -440,7 +440,7 @@
 			echo -n "<option value=\"/dev/$dev\">/dev/$dev "
 			echo -n "$(blk2h < /sys/block/$dev/size) "
 			echo -n "$(cat /sys/block/$dev/device/model 2>/dev/null) "
-			blkid | grep $dev | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/"\1"/;q'
+			busybox blkid | grep $dev | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/"\1"/;q'
 			echo "</option>"
 		done
 		cat <<EOT
diff -r f4650547f496 -r 8e4c1fe85462 hardware.cgi
--- a/hardware.cgi	Thu Sep 24 11:14:22 2020 +0100
+++ b/hardware.cgi	Sun Sep 27 16:12:27 2020 +0000
@@ -434,7 +434,7 @@
 			# action
 			action="mount"
 			[ -n "$mp" ] && action="umount"
-			type=$(blkid $fs | sed '/ TYPE=/!d;s/.* TYPE="\([^"]*\).*/\1/')
+			type=$(busybox blkid $fs | sed '/ TYPE=/!d;s/.* TYPE="\([^"]*\).*/\1/')
 			[ -n "$type" ] || continue
 			[ "$type" = "swap" ] && action="swapon"
 			if grep -q "^$fs " /proc/swaps; then
@@ -472,7 +472,7 @@
 			<tr>
 				<td>$radio<!--
 					--><label for="${fs##*/}" data-icon="$disktype">&thinsp;$dsk</label></td>
-				<td>$(blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
+				<td>$(busybox blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
 				<td>$type</td>
 				<td>$size</td>
 				<td>$av</td>
@@ -491,7 +491,7 @@
 		fi
 		cat <<EOT
 				<td>$mp</td>
-				<td>$(blkid $fs | sed '/UUID=/!d;s/.*UUID="\([^"]*\).*/\1/')</td>
+				<td>$(busybox blkid $fs | sed '/UUID=/!d;s/.*UUID="\([^"]*\).*/\1/')</td>
 			</tr>
 EOT
 		done
diff -r f4650547f496 -r 8e4c1fe85462 index.cgi
--- a/index.cgi	Thu Sep 24 11:14:22 2020 +0100
+++ b/index.cgi	Sun Sep 27 16:12:27 2020 +0000
@@ -862,8 +862,8 @@
 				cat <<EOT
 			<tr>
 				<td><span data-icon="@hdd@">${fs#/dev/}</span></td>
-				<td>$(blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
-				<td>$(blkid $fs | sed '/TYPE=/!d;s/.*TYPE="\([^"]*\).*/\1/')</td>
+				<td>$(busybox blkid $fs | sed '/LABEL=/!d;s/.*LABEL="\([^"]*\).*/\1/')</td>
+				<td>$(busybox blkid $fs | sed '/TYPE=/!d;s/.*TYPE="\([^"]*\).*/\1/')</td>
 				<td>$size</td>
 				<td>$av</td>
 				<td class="meter"><meter min="0" max="100" value="$(echo $pct | cut -d% -f1)"
@@ -871,7 +871,7 @@
 					<span>$used - $pct</span>
 				</td>
 				<td>$mp</td>
-				<td>$(blkid $fs | sed '/UUID=/!d;s/.*UUID="\([^"]*\).*/\1/')</td>
+				<td>$(busybox blkid $fs | sed '/UUID=/!d;s/.*UUID="\([^"]*\).*/\1/')</td>
 			</tr>
 EOT
 		done