# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1345996906 -7200
# Node ID 11c525ec4906e7f304af7cf99ef1fd950af3e8a5
# Parent  afd4941fd37696233da651f40da490b970963164
init: fix suboot

diff -r afd4941fd376 -r 11c525ec4906 init
--- a/init	Sun Aug 26 15:09:53 2012 +0200
+++ b/init	Sun Aug 26 18:01:46 2012 +0200
@@ -8,7 +8,7 @@
 quit()
 {
 [ -d /mnt$4/etc ] || return
-mount /mnt -o remount,ro
+[ -n "$4" ] || mount /mnt -o remount,ro
 mount --move /run /mnt/${1:-run}
 cat>/run/init<<EOT
 $2
@@ -36,7 +36,7 @@
 
 use()
 {
-got $1 && echo msg "$1 $root"
+got $1 && msg "$1 $root"
 }
 
 mnt()
@@ -140,7 +140,8 @@
 trylvm
 if got mount
 then	dev=$root
-	root=$(blkid|grep $root|sed 's/:.*//;q')
+	x=$(blkid|grep $dev|sed 's/:.*//;q')
+	root=${x:-$dev}
 	[ "$dev" = "$root" ] || dev="$root ($dev)"
 	echo "Mount $dev..."
 	mnt /mnt
@@ -156,7 +157,7 @@
 		's|.*=> \(/lib/l[^ ]*\).*|\1|;/^\//!d') /usr/sbin/chroot /run
 	r=$root/run
 	quit $r "export LD_LIBRARY_PATH=$r:/lib"\
-		"$(cd /mnt; ls $r/ld-*) $r/chroot $root" "/$root"
+		"$root$(ls /run/ld-*) $r/chroot $root" "/$root"
 fi
 msg tmpfs
 root=100