# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1356957965 -3600
# Node ID 445b02a1da07f92e35884c9f007680bf6239d51e
# Parent  6eefb649c57b65b06423b1842909a6e3b7c87745
/init: no loram without squashfs

diff -r 6eefb649c57b -r 445b02a1da07 init
--- a/init	Tue Dec 04 18:43:54 2012 +0100
+++ b/init	Mon Dec 31 13:46:05 2012 +0100
@@ -57,7 +57,7 @@
 modprobe $1 2>/dev/null || insmod $(find /lib/modules|sed "/$1.ko/!dq") 
 }
 
-tryinit()
+try()
 {
 if [ ! -d /mnt/etc ] && got cryptoroot
 then	mod dm-mod
@@ -84,14 +84,14 @@
 fail
 }
 
-trylvm()
+lvm()
 {
 use lvmroot || return
 mod dm-mod
 vgscan --ignorelockingfailure
 vgchange -ay --ignorelockingfailure
 mount /dev/mapper/$root /mnt
-tryinit /dev/mapper $1
+try /dev/mapper $1
 }
 
 ldraid()
@@ -135,9 +135,9 @@
 		mdadm -A -s
 		grep -qs ': act' /proc/mdstat && break
 	done
-	trylvm /etc/mdadm.conf
+	lvm /etc/mdadm.conf
 fi
-trylvm
+lvm
 if got mount
 then	dev=$root
 	x=$(blkid|grep $dev|sed 's/:.*//;q')
@@ -151,13 +151,13 @@
 	losetup /dev/loop0 /mnt/$root && mount /dev/loop0 /mnt
 got bindfs && echo "Bind ${root/,/ to }..." &&
 	mount --bind /mnt/${root%,*} /mnt/${root/,//}
-arg cryptoroot= && tryinit
+arg cryptoroot= && try
 if use subroot
 then	cp $(LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so /usr/sbin/chroot | sed\
 		's|.*=> \(/lib/l[^ ]*\).*|\1|;/^\//!d') /usr/sbin/chroot /run
 	r=$root/run
 	quit $r "export LD_LIBRARY_PATH=$r:/lib"\
-		"$root$(ls /run/ld-*) $r/chroot $root" "/$root"
+		"$root$(ls /run/ld-*so) $r/chroot $root" "/$root"
 fi
 quit
 msg tmpfs
@@ -180,6 +180,7 @@
 	esac
 done || fail 3mSkipped
 quit
+mod squashfs 2>/dev/null || exit
 msg aufs
 br=/mnt/.rw
 mkdir $br
@@ -197,7 +198,6 @@
 	c=$c$d
 fi
 l=0
-mod squashfs
 r=
 got isofs || for i in /mnt$p/rootfs?*.gz
 do	fs=${i#*root}