# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1385033663 0
# Node ID 781029802e4a5d39cd78948331b7476c751af6e0
# Parent  d36394ef35a1c7ba1120278005b8c5c8a94ee24e
busybox-root: fix root=device|UUID|LABEL cmdline

diff -r d36394ef35a1 -r 781029802e4a busybox-boot/receipt
--- a/busybox-boot/receipt	Wed Nov 20 16:06:44 2013 +0000
+++ b/busybox-boot/receipt	Thu Nov 21 11:34:23 2013 +0000
@@ -25,6 +25,9 @@
 	done
 	cp -a $src/busybox-$CHOICE $fs/usr/share/boot/bin/busybox
 	chmod 4755 $fs/usr/share/boot/bin/busybox
+	for i in sed mount mknod mkdir sh cp ln ; do
+		ln $fs/usr/share/boot/bin/busybox $fs/usr/share/boot/bin/$i
+	done
 	mknod -m 660 $fs/usr/share/boot/dev/console c 5 1
 	mknod -m 771 $fs/usr/share/boot/dev/null c 1 3
 	mknod -m 660 $fs/usr/share/boot/dev/tty c 5 0
@@ -34,15 +37,24 @@
 		mknod -m 660 $fs/usr/share/boot/dev/ttyS0 c 4 64
 	fi
 	cat > $fs/usr/share/boot/init <<EOT
-#!/bin/busybox sh
-
-for i in \$(busybox --list) ; do busybox ln /bin/busybox /bin/\$i; done
+#!/bin/sh
 
 export PATH=/bin
 export HOME=/
 export TERM=vt100
 
-mkdir /tmp /mnt /proc
+if [ -n "\$1" ]; then
+	[ -n "\$broadcast" ] && BROADCAST="broadcast \$broadcast"
+	[ -n "\$subnet" ] && NETMASK="netmask \$subnet"
+	ifconfig \$interface \${ip:-0.0.0.0} \$BROADCAST \$NETMASK
+	while route del default gw 0.0.0.0 dev \$interface ; do : ; done
+	for i in \$router ; do route add default gw \$i dev \$interface; done
+	[ -n "\$domain" ] && echo search \$domain > /etc/resolv.conf
+	for i in \$dns ; do echo nameserver \$i; done >> /etc/resolv.conf
+	exit 0
+fi
+
+mkdir /tmp /mnt /proc /etc
 mount -t proc none /proc
 while read name major minor ; do
 	for i in '' 1 2 3 4 5 6 7 8 9 ; do
@@ -58,14 +70,20 @@
 
 arg()
 {
-grep -q \$1= /proc/cmdline && root="\$(sed "s/.*\$1=\\([^ ]*\\).*/\\1/" </proc/cmdline)"
+root="\$(sed "s/^/ /;s/\$/ /;/ \$1=/!d;s/.* \$1=\\([^ ]*\\).*/\\1/" </proc/cmdline)"
+busybox [ -n "\$root" ]
 }
 
-arg mount && mount \$root /mnt
-arg loopfs && losetup /dev/loop /mnt/\$root && mount /dev/loop /mnt
+arg init
+init=\${root:-/sbin/init}
+arg root && root="\$(echo \$root | sed 's|/|\\\\/|g')" &&
+	mount \$(busybox blkid | sed "s/\"//g;/\$root/!d;s/:.*//;q") /mnt
+arg loopfs && busybox losetup /dev/loop /mnt/\$root && mount /dev/loop /mnt
 arg subroot && cp /bin/busybox /mnt/\$root/dev/shm &&
-exec switch_root mnt \$root/dev/shm/busybox chroot \$root /sbin/init
-arg loopfs && exec switch_root mnt /sbin/init
+	chroot="\$root/dev/shm/busybox chroot \$root"
+busybox [ -x /mnt/\$root\$init ] && exec busybox switch_root mnt \$chroot \$init
+
+for i in \$(busybox --list) ; do busybox ln /bin/busybox /bin/\$i; done
 
 [ -d /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb
 while read type dir ; do
@@ -82,6 +100,7 @@
 	$jslinux && echo 'stty -F $TTY rows 30 2>/dev/null' >> $fs/usr/share/boot/init
 	cat >> $fs/usr/share/boot/init <<EOT
 
+[ -x /bin/udhcpc ] && udhcpc -b -s /init
 while true; do
 	busybox | sed '/Current/,\$!d'
 	if [ -x /bin/setsid ]; then