# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1327402099 -3600
# Node ID dc053ae50d10697bfd923adbe2e2d8747d5df4d6
# Parent  226e35b1edfc03c2e846345ebd382495eb51d38e
Up slitaz-boot-scripts (4.6)

diff -r 226e35b1edfc -r dc053ae50d10 busybox/receipt
--- a/busybox/receipt	Mon Jan 23 19:52:09 2012 +0000
+++ b/busybox/receipt	Tue Jan 24 11:48:19 2012 +0100
@@ -100,7 +100,6 @@
 		grep -qi config_$i=y $stuff/$PACKAGE-${VERSION%.*}.config && 
 		ln -s daemon $fs/etc/init.d/$i
     done
-    cp $stuff/init $fs
     rm $fs/linuxrc
     mkdir -p $fs/etc/modprobe.d
     
diff -r 226e35b1edfc -r dc053ae50d10 busybox/stuff/init
--- a/busybox/stuff/init	Mon Jan 23 19:52:09 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-#!/bin/sh
-
-launch_init()
-{
-	[ -d /proc/sys ] && umount /proc
-	echo -e "\\033[70G[ \\033[1;32mOK\\033[0;39m ]"
-	exec /sbin/switch_root mnt /sbin/init
-}
-
-failed()
-{
-	umount /proc
-	echo -e "\\033[70G[ \\033[1;31mFailed\\033[0;39m ]"
-	conspy -d 1 > /init.log
-}
-
-try_init()
-{
-	if [ ! -d /mnt/etc ] && grep -q cryptoroot= /proc/cmdline; then
-		modprobe dm-mod
-		modprobe dm-crypt
-		modprobe aes-i586
-		root="$(sed 's/.*cryptoroot=\([^ ]*\).*/\1/' < /proc/cmdline)"
-		dev=${root#/dev/}
-		dmlabel=crypto-$dev
-		if cryptsetup isLuks $root 2> /dev/null; then
-			cryptsetup luksOpen $root $dmlabel
-		else
-			read -s -t 60 -p "Pass phrase : " passphrase
-			key=$(echo $passphrase | hashalot -x -n 32 sha512)
-			blocks=$(cat $(find /sys/block | grep /$dev/size))
-			echo 0 $blocks crypt aes-plain $key 0 $root 0 | \
-				dmsetup create $dmlabel
-		fi
-		mount /dev/mapper/$dmlabel /mnt
-	fi
-	if [ -d /mnt/etc ]; then
-		umount /sys
-		[ -n "$1" ] && for i in $@ ; do
-			cp -a $i /mnt$(dirname $i)
-		done
-		mount /mnt -o remount,ro
-		launch_init
-	fi
-	failed
-}
-
-mount_mapper()
-{
-	mount $root /mnt
-	try_init /dev/mapper $@
-}
-
-lvmsetup()
-{
-	grep -q lvmroot= /proc/cmdline || return 1
-	modprobe dm-mod
-	vgscan --ignorelockingfailure
-	vgchange -ay --ignorelockingfailure
-	root="/dev/mapper/$(sed 's/.*lvmroot=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	return 0
-}
-
-load_raid()
-{
-while read line; do
-	case "$line" in
-	*raid10*)	modprobe raid10 ;;
-	*raid0*)	modprobe raid0 ;;
-	*raid1*)	modprobe raid1 ;;
-	*raid[456]*)	modprobe raid456 ;;
-	esac
-done
-}
-
-mount -t proc proc /proc
-mount -t sysfs sysfs /sys
-echo -n "Switching / to "
-if grep -q dmraid= /proc/cmdline; then
-	root="$(sed 's/.*dmraid=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	echo -n "dmraid $root..."
-	dmraid -s | grep ^type | awk '{ print $3 }' | load_raid
-	case "$root" in
-	/dev/*);;
-	*) root=/dev/mapper/$(dmraid -s|grep ^name|awk '{print $3}')p${root#p};;
-	esac
-	dmraid -ay
-	lvmsetup 
-	mount_mapper
-fi
-if grep -q softraid= /proc/cmdline; then
-	root="$(sed 's/.*softraid=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	echo -n "softraid $root..."
-	mdadm --examine --scan --config=partitions > /etc/mdadm.conf
-	grep -qs " $root " /etc/mdadm.conf ||
-		root=$(awk '/dev.md/ { print $2; exit }' < /etc/mdadm.conf)
-	grep level=raid /etc/mdadm.conf | load_raid
-	for i in 1 2 3 4 5 6 7 8 9; do
-		sleep $i
-		mdadm --assemble --scan
-		grep -qs ': active' /proc/mdstat && break
-	done
-	lvmsetup 
-	mount_mapper /etc/mdadm.conf
-fi
-if lvmsetup; then
-	echo -n "lvm $root..."
-	mount_mapper
-fi
-if grep -q mount= /proc/cmdline; then
-	root="$(sed 's/.*mount=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	dev=$(blkid | grep $root | sed 's/:.*//;q')
-	echo -n "Mounting $dev ($root) ..."
-	if ! mount $dev /mnt; then
-		if echo $dev | grep -q "/dev/sd"; then
-			delay=`cat /sys/module/usb_storage/parameters/delay_use`
-			delay=$((1+$delay))
-			echo -n "sleep for $delay seconds..."
-			sleep $delay
-		fi
-		mount $dev /mnt
-	fi
-	grep -q posixovl /proc/cmdline && mount.posixovl /mnt
-fi
-if grep -q loopfs= /proc/cmdline; then
-	loopfs="$(sed 's/.*loopfs=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	echo -n "loop $loopfs..."
-	losetup /dev/loop0 /mnt/$loopfs
-	mount /dev/loop0 /mnt 2> /dev/null
-fi
-if grep -q bindfs= /proc/cmdline; then
-	bind="$(sed 's/.*bindfs=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	mount --bind /mnt/${bind%,*} /mnt/${bind%,*}/${bind#*,}
-fi
-grep -q cryptoroot= /proc/cmdline && try_init
-umount /sys
-if grep -q subroot= /proc/cmdline; then
-	subroot="/$(sed 's/.*subroot=\([^ ]*\).*/\1/' < /proc/cmdline)" &&
-	if [ -s /usr/share/boot/busybox-static ]; then
-		mv /usr/share/boot/busybox-static .
-		/busybox-static rm -rf /etc /lib /*bin /usr /var
-		exec /busybox-static chroot /mnt$subroot /sbin/init
-	else
-		exec chroot /mnt$subroot /sbin/init
-	fi
-fi
-echo -n "tmpfs..."
-size="$(grep rootfssize= < /proc/cmdline | \
-	sed 's/.*rootfssize=\([0-9]*[kmg%]\).*/-o size=\1/')"
-free=$(busybox free | busybox awk '/Mem:/ { print int(($4*100)/$3) }')
-umount /proc
-[ -n "$size" ] || size="-o size=90%"
-if [ $free -lt 100 ] || ! mount -t tmpfs $size tmpfs /mnt; then
-	echo -e "\\033[70G[ \\033[1;33mSkipped\\033[0;39m]"
-	exec /sbin/init
-fi
-for i in $(ls -a /); do
-	case "$i" in
-	.|..)	;;
-	mnt)	mkdir /mnt/mnt;;
-	*)	if ! cp -a /$i /mnt 2> /dev/null; then
-			failed
-			umount /mnt
-			exec /sbin/init
-		fi;;
-	esac
-done
-launch_init
diff -r 226e35b1edfc -r dc053ae50d10 slitaz-boot-scripts/receipt
--- a/slitaz-boot-scripts/receipt	Mon Jan 23 19:52:09 2012 +0000
+++ b/slitaz-boot-scripts/receipt	Tue Jan 24 11:48:19 2012 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-boot-scripts"
-VERSION="4.5"
+VERSION="4.6"
 CATEGORY="base-system"
 SHORT_DESC="Provide all the initialisation scripts used at boot time."
 MAINTAINER="pankso@slitaz.org"
@@ -21,12 +21,14 @@
 	mkdir -p $fs/usr/share $fs/etc/X11
 	cp -a $src/etc $fs
 	cp -a $src/bin $fs
+	cp -a $src/init $fs
 	cp -a $src/applications $fs/usr/share
 
 	# Perms
 	chown -R root.root $fs
 	chmod 755 $fs/etc/init.d/*.sh
 	chmod 755 $fs/etc/init.d/rc*
+	chmod 755 $fs/init
 }
 
 # Pre install commands.