# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1408544859 -7200
# Node ID 213b944add2c9a763d1d06aff255cdc177756090
# Parent  95ae6a87842c4a546e0d3bd02e9ce09a9ebc3313
busyboot-boot: use devtmpfs

diff -r 95ae6a87842c -r 213b944add2c busybox-boot/receipt
--- a/busybox-boot/receipt	Wed Aug 20 12:40:53 2014 +0200
+++ b/busybox-boot/receipt	Wed Aug 20 16:27:39 2014 +0200
@@ -38,7 +38,7 @@
 		mknod -m 660 $fs/usr/share/boot/dev/ttyS0 c 4 64
 	fi
 	cat > $fs/usr/share/boot/init <<EOT
-#!/bin/sh
+#!/bin/busybox sh
 
 export PATH=/bin
 export HOME=/
@@ -58,21 +58,7 @@
 
 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
-		mknod -m 644 /dev/\$name\$i b \$major \$((\$i + \$minor))
-	done
-done <<EOM
-loop	7	0
-hda	3	0
-hdb	3	64
-hdc	22	0
-hdd	22	64
-sda	8	0
-sdb	8	16
-sdc	8	32
-sdd	8	48
-EOM
+mount -t devtmpfs none /dev
 
 arg()
 {
@@ -85,22 +71,20 @@
 [ -n "\$(sed 's/\$/ /;s/^/ /;/ ro /!d' /proc/cmdline)" ] && ro="-o ro"
 [ -n "\$(sed 's/\$/ /;s/^/ /;/ rw /!d' /proc/cmdline)" ] && ro="-o rw"
 arg root && root="\$(echo \$root | sed 's|/|\\\\/|g')" &&
-	mount \$ro \$(busybox blkid | sed "s/\"//g;/\$root/!d;s/:.*//;q") /mnt
-arg loopfs && busybox losetup /dev/loop /mnt/\$root && mount /dev/loop /mnt
+	root="\$(busybox blkid | sed "s/\"//g;/\$root/!d;s/:.*//;q")" &&
+	[ -n "\$root" ] && mount \$ro \$root /mnt
+arg loopfs && busybox losetup /dev/loop0 /mnt/\$root && mount /dev/loop0 /mnt
 arg subroot && cp /bin/busybox /mnt/\$root/dev/shm &&
 	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 ln /bin/busybox /bin/\$i 2> /dev/null ; done
+busybox [ -x /mnt/\$root/\$init ] && umount /dev && umount /proc && exec busybox switch_root mnt \$chroot \$init
 
 [ -d /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb
 while read type dir ; do
 	grep -qs \$type /proc/filesystems || continue
-	mkdir \$dir
+	[ -d "\$dir" ] || mkdir \$dir
 	mount -t \$type none \$dir
 done <<EOM
 sysfs		/sys
-devtmpfs	/dev
 devpts		/dev/pts
 EOM
 
@@ -110,14 +94,10 @@
 	$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
+udhcpc -b -s /init
 while true; do
 	busybox | sed '/Current/,\$!d'
-	if [ -x /bin/setsid ]; then
-		setsid sh -c "exec sh <\$TTY >\$TTY 2>&1"
-	else
-		sh <\$TTY >\$TTY 2>&1
-	fi
+	setsid sh -c "exec sh <\$TTY >\$TTY 2>&1"
 done
 EOT
 	chmod +x $fs/usr/share/boot/init
diff -r 95ae6a87842c -r 213b944add2c busybox/stuff/busybox-1.22.config-static
--- a/busybox/stuff/busybox-1.22.config-static	Wed Aug 20 12:40:53 2014 +0200
+++ b/busybox/stuff/busybox-1.22.config-static	Wed Aug 20 16:27:39 2014 +0200
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.22.0
-# Wed Jan  1 19:33:26 2014
+# Wed Aug 20 14:19:25 2014
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -47,8 +47,8 @@
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_PREFER_APPLETS=y
+CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
 # CONFIG_FEATURE_SYSLOG is not set
 # CONFIG_FEATURE_HAVE_RPC is not set
 
@@ -486,10 +486,10 @@
 #
 # Linux Ext2 FS Progs
 #
-# CONFIG_CHATTR is not set
+CONFIG_CHATTR=y
 # CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_FATATTR is not set
+CONFIG_LSATTR=y
+CONFIG_FATATTR=y
 # CONFIG_TUNE2FS is not set
 
 #
@@ -616,7 +616,7 @@
 #
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
+CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
 CONFIG_FEATURE_VOLUMEID_FAT=y
@@ -631,7 +631,7 @@
 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
 # CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
+CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
 # CONFIG_FEATURE_VOLUMEID_UDF is not set
 # CONFIG_FEATURE_VOLUMEID_XFS is not set
@@ -1005,8 +1005,8 @@
 CONFIG_SH_MATH_SUPPORT=y
 # CONFIG_SH_MATH_SUPPORT_64 is not set
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_FEATURE_SH_STANDALONE=y
+CONFIG_FEATURE_SH_NOFORK=y
 # CONFIG_FEATURE_SH_HISTFILESIZE is not set
 
 #