# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1330127887 18000
# Node ID 85aca4fdc71d15925728ef207a440300be0277c1
# Parent  666c76a20586be397c5e6db1b667b1791aa8d840
initramfs: Updated init and linuxrc.

diff -r 666c76a20586 -r 85aca4fdc71d initramfs/init
--- a/initramfs/init	Tue Jan 24 05:06:38 2012 -0500
+++ b/initramfs/init	Fri Feb 24 18:58:07 2012 -0500
@@ -1,35 +1,51 @@
 #!/bin/sh
 
+success()
+{
+	cat > /tmp/init
+	[ -d /proc/sys ] && umount /proc
+	echo -e "\\033[70G[ \\033[1;32mOK\\033[0;39m ]"
+	exit
+}
+
 launch_init()
 {
+	mount --move /dev/pts /mnt/dev/pts
+	mount --move /dev/shm /mnt/dev/shm
+	success <<EOT
+exec /sbin/switch_root mnt /sbin/init
+EOT
+}
+
+failed()
+{
 	[ -d /proc/sys ] && umount /proc
-	echo -e "\\033[70G[ \\033[1;32mOK\\033[0;39m ]"
-	exec /sbin/switch_root mnt /sbin/init
+	echo -e "\\033[70G[ \\033[1;31mFailed\\033[0;39m ]"
 }
 
 launch_init_modular()
 {
-	[ -d /proc/sys ] && umount /proc
 	echo -e "\\033[70G[ \\033[1;32mOK\\033[0;39m ]"
 	[ -d /mnt/initramfs ] || mkdir -p /mnt/initramfs
 	SYS_DIR="dev bin etc boot lib sbin home root run usr var"
 	for dir in $SYS_DIR; do
 		cp -a /$dir /mnt/initramfs
 	done
-	[ -f /mnt/dev/sdc ] || mknod /mnt/dev/sdc b 8 32
-	[ -f /mnt/dev/sdc1 ] || mknod /mnt/dev/sdc1 b 8 33
 	MK_DIR="sys proc tmp media mnt"
 	for dir1 in $MK_DIR; do
 		mkdir -p /mnt/initramfs/$dir1
 	done
-	exec /sbin/switch_root mnt /linuxrc
-}
-
-failed()
-{
-	[ -d /proc/sys ] && umount /proc
-	echo -e "\\033[70G[ \\033[1;31mFailed\\033[0;39m ]"
-	conspy -d 1 > /init.log
+	mount --move /dev /mnt/dev
+	[ -f /mnt/dev/sdc ] || mknod /mnt/dev/sdc b 8 32
+	[ -f /mnt/dev/sdc1 ] || mknod /mnt/dev/sdc1 b 8 33
+	mount --move /run /mnt/run
+	mkdir -p /mnt/dev/pts
+	mount --move /dev/pts /mnt/dev/pts
+	mkdir -p /mnt/dev/shm
+	mount --move /dev/shm /mnt/dev/shm
+	success <<EOT
+exec /sbin/switch_root mnt /linuxrc
+EOT
 }
 
 try_init()
@@ -91,12 +107,20 @@
 done
 }
 
-mount -t proc proc /proc
-mount -t sysfs sysfs /sys
-echo -n "Switching / to "
+if [ "$1" != "logged" ]; then
+	mount -t devpts devpts /dev/pts
+	mount -t tmpfs tmpfs /dev/shm
+	script -qc '/init logged' /dev/shm/boot.log
+	. /tmp/init
+else
+mountpoint -q /proc || mount -t proc proc /proc -o nosuid,noexec,nodev
+mountpoint -q /sys  || mount -t sysfs sys /sys -o nosuid,noexec,nodev
+mountpoint -q /run  || mount -t tmpfs run /run -o mode=0755,nosuid,nodev
+mountpoint -q /dev  || mount -t devtmpfs dev /dev -o mode=0755,nosuid
+
 if grep -q dmraid= /proc/cmdline; then
 	root="$(sed 's/.*dmraid=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	echo -n "dmraid $root..."
+	echo -n "Switching / to dmraid $root..."
 	dmraid -s | grep ^type | awk '{ print $3 }' | load_raid
 	case "$root" in
 	/dev/*);;
@@ -108,7 +132,7 @@
 fi
 if grep -q softraid= /proc/cmdline; then
 	root="$(sed 's/.*softraid=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	echo -n "softraid $root..."
+	echo -n "Switching / to 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)
@@ -122,13 +146,13 @@
 	mount_mapper /etc/mdadm.conf
 fi
 if lvmsetup; then
-	echo -n "lvm $root..."
+	echo -n "Switching / to 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) ..."
+	echo "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`
@@ -142,37 +166,45 @@
 fi
 if grep -q loopfs= /proc/cmdline; then
 	loopfs="$(sed 's/.*loopfs=\([^ ]*\).*/\1/' < /proc/cmdline)"
-	echo -n "loop $loopfs..."
+	echo -n "Into loop file $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)"
+	echo "Binding ${bind/,/ to } ..."
 	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
+	echo -n "Chrooting to $subroot..."
+	mount --move /dev/pts /mnt$subroot/dev/pts
+	shm=$subroot/dev/shm
+	mount --move /dev/shm /mnt$shm &&
+	if mv /usr/share/boot/busybox-static /mnt$shm 2> /dev/null; then
+		success <<EOT
+exec /sbin/switch_root mnt $shm/busybox-static chroot $subroot /sbin/init
+EOT
 	else
-		exec chroot /mnt$subroot /sbin/init
+		success <<EOT
+exec chroot /mnt$subroot /sbin/init
+EOT
 	fi
 fi
-echo -n "tmpfs..."
+echo -n "Switching / to 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 "exec /sbin/init" > /tmp/init
+if [ $free -lt 50 ] || ! mount -t tmpfs $size tmpfs /mnt; then
 	echo -e "\\033[70G[ \\033[1;33mSkipped\\033[0;39m]"
-	exec /sbin/init
+	exit
 fi
-for i in $(ls -a /); do
+for i in $(ls -ar /); do
 	case "$i" in
 	.|..)	;;
 	mnt)	mkdir /mnt/mnt;;
@@ -184,3 +216,4 @@
 	esac
 done
 launch_init_modular
+fi
diff -r 666c76a20586 -r 85aca4fdc71d initramfs/linuxrc
--- a/initramfs/linuxrc	Tue Jan 24 05:06:38 2012 -0500
+++ b/initramfs/linuxrc	Fri Feb 24 18:58:07 2012 -0500
@@ -4,8 +4,8 @@
 
 export PATH=.:/:/usr/sbin:/usr/bin:/sbin:/bin
 
-mount -n -t proc proc /proc
-mount -n -t sysfs sysfs /sys
+mount -t proc proc /proc -o nosuid,noexec,nodev
+mount -t sysfs sys /sys -o nosuid,noexec,nodev
 #mount -n -o remount,rw /         # for the case we forgot rw boot option
 ln -sf /proc/mounts /etc/mtab    # this allows us to use umount -a
 
@@ -320,8 +320,12 @@
 #mount -n -o move /proc proc
 #mount -n -o move /sys sys
 fumount /sys
+fumount /run
+fumount /dev
 
 if [ ! -e /dev/console ]; then mknod /dev/console c 5 1; fi
+if [ ! -d dev/shm ]; then mkdir -p dev/shm; fi
+if [ ! -d dev/pts ]; then mkdir -p dev/pts; fi
 
 # find chroot and init
 if [ -x bin/chroot ]; then  CHROOT=bin/chroot; fi