slitaz-boot-scripts rev 409

init: use busybox blkid
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Aug 15 09:21:41 2015 +0200 (2015-08-15)
parents 1542a6f14fae
children f9871e7a85b4
files init
line diff
     1.1 --- a/init	Sun Aug 02 15:13:28 2015 +0200
     1.2 +++ b/init	Sat Aug 15 09:21:41 2015 +0200
     1.3 @@ -91,10 +91,12 @@
     1.4  
     1.5  mnt()
     1.6  {
     1.7 -r=$(blkid 2> /dev/null | sed "s|\"||g;/$(echo $root | tr / .)/!d;s|:.*||;q")
     1.8 +r=$(busybox blkid 2> /dev/null | sed "s|\"||g;/$(echo $root | tr / .)/!d;s|:.*||;q")
     1.9  r=${r:-$root}
    1.10 -r=${r#/dev/}
    1.11 -r=/dev/${r%%/*}
    1.12 +if [ ! -b $r ]; then
    1.13 +	r=${r#/dev/}
    1.14 +	r=/dev/${r%%/*}
    1.15 +fi
    1.16  d=${root#*$r}
    1.17  busybox mount $r $1 && return
    1.18  w=$(cat /sys/module/usb_storage/parameters/delay_use)
    1.19 @@ -205,7 +207,7 @@
    1.20  lvm
    1.21  if got mount; then
    1.22  	dev=$root
    1.23 -	x=$(blkid|grep $dev|sed 's/:.*//;q')
    1.24 +	x=$(busybox blkid|grep $dev|sed 's/:.*//;q')
    1.25  	root=${x:-$dev}
    1.26  	[ "$dev" = "$root" ] || dev="$root ($dev)"
    1.27  	echo "Mount $dev..."