SliTaz Repositories

     1.1 --- a/init	Tue Nov 18 15:48:48 2014 +0100
     1.2 +++ b/init	Mon Mar 23 02:01:21 2015 +0200
     1.3 @@ -106,7 +106,7 @@
     1.4  {
     1.5  for i in $@; do
     1.6  	echo "Loading module: $i"
     1.7 -	modprobe $i 2>/dev/null || busybox insmod $(find /lib/modules|sed "/$i.ko/!dq") 
     1.8 +	modprobe $i 2>/dev/null || busybox insmod $(find /lib/modules|sed "/$i.ko/!dq")
     1.9  done
    1.10  }
    1.11  
    1.12 @@ -149,14 +149,14 @@
    1.13  
    1.14  ldraid()
    1.15  {
    1.16 -while read l
    1.17 -do case "$l" in
    1.18 -*raid10*)	mod raid10;;
    1.19 -*raid0*)	mod raid0;;
    1.20 -*raid1*)	mod raid1;;
    1.21 -*raid*)		mod raid456;;
    1.22 -*mirror*)	mod dm-mirror
    1.23 -esac
    1.24 +while read l; do
    1.25 +	case "$l" in
    1.26 +		*raid10*)	mod raid10;;
    1.27 +		*raid0*)	mod raid0;;
    1.28 +		*raid1*)	mod raid1;;
    1.29 +		*raid*)		mod raid456;;
    1.30 +		*mirror*)	mod dm-mirror;;
    1.31 +	esac
    1.32  done
    1.33  }
    1.34  
    1.35 @@ -173,28 +173,28 @@
    1.36  fi
    1.37  got modprobe && mod ${root//,/ }
    1.38  [ -d /proc/sys/dev/cdrom ] &&
    1.39 -ln -s $(sed '/name/!d;s/.*:[^a-z]*//' /proc/sys/dev/cdrom/info) /dev/cdrom
    1.40 -if use dmraid
    1.41 -then	dmraid -s|sed '/^type/!ds/.*: *//'|ldraid
    1.42 +	ln -s $(sed '/name/!d;s/.*:[^a-z]*//' /proc/sys/dev/cdrom/info) /dev/cdrom
    1.43 +if use dmraid; then
    1.44 +	dmraid -s | sed '/^type/!ds/.*: *//' | ldraid
    1.45  	[ ${root:0:4} = /dev ] ||
    1.46 -	root=/dev/mapper/$(dmraid -s|sed '/^name/!ds/.*: *//')p${root#p}
    1.47 +		root=/dev/mapper/$(dmraid -s|sed '/^name/!ds/.*: *//')p${root#p}
    1.48  	dmraid -ay
    1.49  fi
    1.50 -if use softraid
    1.51 -then	mdadm -E -s -c partitions>/etc/mdadm.conf
    1.52 +if use softraid; then
    1.53 +	mdadm -E -s -c partitions > /etc/mdadm.conf
    1.54  	grep -qs " $root " /etc/mdadm.conf ||
    1.55 -	root=$(awk '/dev.md/{print $2;exit}'</etc/mdadm.conf)
    1.56 -	grep level=raid /etc/mdadm.conf|ldraid
    1.57 -	for i in 1 2 3 4 5 6 7 8 9
    1.58 -	do	sleep $i
    1.59 +		root=$(awk '/dev.md/{print $2;exit}' < /etc/mdadm.conf)
    1.60 +	grep level=raid /etc/mdadm.conf | ldraid
    1.61 +	for i in 1 2 3 4 5 6 7 8 9; do
    1.62 +		sleep $i
    1.63  		mdadm -A -s
    1.64  		grep -qs ': act' /proc/mdstat && break
    1.65  	done
    1.66  	lvm /etc/mdadm.conf
    1.67  fi
    1.68  lvm
    1.69 -if got mount
    1.70 -then	dev=$root
    1.71 +if got mount; then
    1.72 +	dev=$root
    1.73  	x=$(blkid|grep $dev|sed 's/:.*//;q')
    1.74  	root=${x:-$dev}
    1.75  	[ "$dev" = "$root" ] || dev="$root ($dev)"
    1.76 @@ -208,8 +208,8 @@
    1.77  got bindfs && echo "Bind ${root/,/ to }..." &&
    1.78  	busybox mount --bind /mnt/${root%,*} /mnt/${root/,//}
    1.79  arg cryptoroot= && try
    1.80 -if use subroot
    1.81 -then	cp $(LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so /usr/sbin/chroot | sed\
    1.82 +if use subroot; then
    1.83 +	cp $(LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so /usr/sbin/chroot | sed\
    1.84  		's|.*=> \(/lib/l[^ ]*\).*|\1|;/^\//!d') /usr/sbin/chroot /run
    1.85  	r=$root/run
    1.86  	quit $r "export LD_LIBRARY_PATH=$r:/lib"\
    1.87 @@ -223,9 +223,9 @@
    1.88  root=90%
    1.89  got rootfssize
    1.90  [ $(busybox free|busybox awk '/Mem:/{print int(($4*100)/$3)}') -ge $r ] &&
    1.91 -busybox mount -t tmpfs -o size=$root tmpfs /mnt &&
    1.92 -for i in $(ls -ar /)
    1.93 -do	case "$i" in
    1.94 +	busybox mount -t tmpfs -o size=$root tmpfs /mnt &&
    1.95 +for i in $(ls -ar /); do
    1.96 +	case "$i" in
    1.97  	.*|cdrom)	;;
    1.98  	mnt|proc|sys)	mkdir /mnt/$i;;
    1.99  	usr|var|rootfs*) mv /$i /mnt;;
   1.100 @@ -244,8 +244,8 @@
   1.101  o=
   1.102  p=
   1.103  c=/mnt/.cdrom
   1.104 -if [ -z "$(ls /mnt/rootfs* 2>/dev/null)" ]
   1.105 -then	root=/dev/cdrom/fs
   1.106 +if [ -z "$(ls /mnt/rootfs* 2>/dev/null)" ]; then
   1.107 +	root=/dev/cdrom/fs
   1.108  	got rodev
   1.109  	mkdir -p $c /mnt$c /mnt/.rw$c
   1.110  	mnt $c
   1.111 @@ -255,8 +255,8 @@
   1.112  fi
   1.113  l=0
   1.114  r=
   1.115 -got isofs || for i in /mnt$p/rootfs?*.gz
   1.116 -do	fs=${i#*root}
   1.117 +got isofs || for i in /mnt$p/rootfs?*.gz; do
   1.118 +	fs=${i#*root}
   1.119  	r=$r:/mnt/.$fs
   1.120  	mkdir -p /mnt/.rw/mnt/.$fs /mnt/.$fs
   1.121  	losetup $o /dev/loop$l $i