# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1439623301 -7200
# Node ID e8f0c7c134f1a35e3b79aecf893ab40c8210994e
# Parent  1542a6f14faed450d2ea5f064c2c3b2e60bee443
init: use busybox blkid

diff -r 1542a6f14fae -r e8f0c7c134f1 init
--- a/init	Sun Aug 02 15:13:28 2015 +0200
+++ b/init	Sat Aug 15 09:21:41 2015 +0200
@@ -91,10 +91,12 @@
 
 mnt()
 {
-r=$(blkid 2> /dev/null | sed "s|\"||g;/$(echo $root | tr / .)/!d;s|:.*||;q")
+r=$(busybox blkid 2> /dev/null | sed "s|\"||g;/$(echo $root | tr / .)/!d;s|:.*||;q")
 r=${r:-$root}
-r=${r#/dev/}
-r=/dev/${r%%/*}
+if [ ! -b $r ]; then
+	r=${r#/dev/}
+	r=/dev/${r%%/*}
+fi
 d=${root#*$r}
 busybox mount $r $1 && return
 w=$(cat /sys/module/usb_storage/parameters/delay_use)
@@ -205,7 +207,7 @@
 lvm
 if got mount; then
 	dev=$root
-	x=$(blkid|grep $dev|sed 's/:.*//;q')
+	x=$(busybox blkid|grep $dev|sed 's/:.*//;q')
 	root=${x:-$dev}
 	[ "$dev" = "$root" ] || dev="$root ($dev)"
 	echo "Mount $dev..."