slitaz-boot-scripts rev 323
/init: no loram without squashfs
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Dec 31 13:46:05 2012 +0100 (2012-12-31) |
parents | 6eefb649c57b |
children | b1986b2be1f0 |
files | init |
line diff
1.1 --- a/init Tue Dec 04 18:43:54 2012 +0100 1.2 +++ b/init Mon Dec 31 13:46:05 2012 +0100 1.3 @@ -57,7 +57,7 @@ 1.4 modprobe $1 2>/dev/null || insmod $(find /lib/modules|sed "/$1.ko/!dq") 1.5 } 1.6 1.7 -tryinit() 1.8 +try() 1.9 { 1.10 if [ ! -d /mnt/etc ] && got cryptoroot 1.11 then mod dm-mod 1.12 @@ -84,14 +84,14 @@ 1.13 fail 1.14 } 1.15 1.16 -trylvm() 1.17 +lvm() 1.18 { 1.19 use lvmroot || return 1.20 mod dm-mod 1.21 vgscan --ignorelockingfailure 1.22 vgchange -ay --ignorelockingfailure 1.23 mount /dev/mapper/$root /mnt 1.24 -tryinit /dev/mapper $1 1.25 +try /dev/mapper $1 1.26 } 1.27 1.28 ldraid() 1.29 @@ -135,9 +135,9 @@ 1.30 mdadm -A -s 1.31 grep -qs ': act' /proc/mdstat && break 1.32 done 1.33 - trylvm /etc/mdadm.conf 1.34 + lvm /etc/mdadm.conf 1.35 fi 1.36 -trylvm 1.37 +lvm 1.38 if got mount 1.39 then dev=$root 1.40 x=$(blkid|grep $dev|sed 's/:.*//;q') 1.41 @@ -151,13 +151,13 @@ 1.42 losetup /dev/loop0 /mnt/$root && mount /dev/loop0 /mnt 1.43 got bindfs && echo "Bind ${root/,/ to }..." && 1.44 mount --bind /mnt/${root%,*} /mnt/${root/,//} 1.45 -arg cryptoroot= && tryinit 1.46 +arg cryptoroot= && try 1.47 if use subroot 1.48 then cp $(LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so /usr/sbin/chroot | sed\ 1.49 's|.*=> \(/lib/l[^ ]*\).*|\1|;/^\//!d') /usr/sbin/chroot /run 1.50 r=$root/run 1.51 quit $r "export LD_LIBRARY_PATH=$r:/lib"\ 1.52 - "$root$(ls /run/ld-*) $r/chroot $root" "/$root" 1.53 + "$root$(ls /run/ld-*so) $r/chroot $root" "/$root" 1.54 fi 1.55 quit 1.56 msg tmpfs 1.57 @@ -180,6 +180,7 @@ 1.58 esac 1.59 done || fail 3mSkipped 1.60 quit 1.61 +mod squashfs 2>/dev/null || exit 1.62 msg aufs 1.63 br=/mnt/.rw 1.64 mkdir $br 1.65 @@ -197,7 +198,6 @@ 1.66 c=$c$d 1.67 fi 1.68 l=0 1.69 -mod squashfs 1.70 r= 1.71 got isofs || for i in /mnt$p/rootfs?*.gz 1.72 do fs=${i#*root}