From: Mike Baker <mbm@openwrt.org>
Date: Thu, 10 May 2007 16:29:15 +0000 (+0000)
Subject: cleanup the broadcom preinit.arch
X-Git-Tag: kamikaze_7.06~44
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3fda1fbf87d631cf54a1fc579fab401f65693fb5;p=openwrt%2Fsvn-archive%2Fopenwrt.git

cleanup the broadcom preinit.arch

SVN-Revision: 7176
---

diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index a783f3d8ff..f1d93bafc3 100755
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -2,34 +2,37 @@
 # Copyright (C) 2006 OpenWrt.org
 . /etc/functions.sh
 
+mkdir -p /dev/pts /dev/shm
+mount none /dev/pts -t devpts
 mount none /proc -t proc
 
 size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo)
 mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
 
-if grep devfs /proc/filesystems >/dev/null; then
+if grep devfs /proc/filesystems > /dev/null; then
 	mount none /dev -t devfs
+	M0=/dev/pty/m0
+	M1=/dev/pty/m1
+	HOTPLUG=/sbin/hotplug-call
 else
+	mount -t sysfs none /sys
 	mount -t tmpfs tmpfs /dev -o size=512K
 	mknod /dev/console c 5 1
-	exec >/dev/console </dev/console 2>&1
+	mkdir /dev/shm
+	/sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
+	M0=/dev/ptmx
+	M1=/dev/ptmx
+	HOTPLUG=
 fi
 
-mkdir /dev/shm
+# the shell really doesn't like having stdin/out closed
+# that's why we use /dev/pty/m0 and m1 as replacement
+# for /dev/console if there's no serial console available
+dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null || \
+	exec <$M0 >$M1 2>&0
 
-if grep sysfs /proc/filesystems >/dev/null; then
-	mount -t sysfs none /sys
-	HOTPLUG=""
-	# use a minimal ruleset only for creating device nodes
-	/sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
-else
-	HOTPLUG="/sbin/hotplug2-dnode"
-fi
 echo "$HOTPLUG" > /proc/sys/kernel/hotplug
 
-mkdir -p /dev/pts
-mount none /dev/pts -t devpts
-
 jffs2_ready () {
 	mtdpart="$(find_mtd_part rootfs_data)"
 	magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
diff --git a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch b/target/linux/brcm-2.4/base-files/default/etc/preinit.arch
index d3a0bfc491..ec171c356e 100755
--- a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch
+++ b/target/linux/brcm-2.4/base-files/default/etc/preinit.arch
@@ -26,30 +26,6 @@ failsafe() {
 
 mount none /proc -t proc
 
-if grep devfs /proc/filesystems > /dev/null; then
-	mount none /dev -t devfs
-	M0=/dev/pty/m0
-	M1=/dev/pty/m1
-	HOTPLUG=/sbin/hotplug-call
-else
-	mount -t sysfs none /sys
-	mount -t tmpfs tmpfs /dev -o size=512K
-	mknod /dev/console c 5 1
-	mkdir /dev/shm
-	/sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
-	M0=/dev/ptmx
-	M1=/dev/ptmx
-	HOTPLUG=
-fi
-mkdir -p /dev/pts
-mount none /dev/pts -t devpts
-
-# the shell really doesn't like having stdin/out closed
-# that's why we use /dev/pty/m0 and m1 as replacement
-# for /dev/console if there's no serial console available
-dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null || \
-	exec <$M0 >$M1 2>&0
-
 insmod diag
 set_state preinit
 trap 'FAILSAFE=true' USR1
@@ -81,7 +57,7 @@ insmod switch-robo || insmod switch-adm || rmmod switch-core
 	}; done
 } || netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
 
+ifconfig $ifname 0.0.0.0 down
+
 sleep 2
-echo "$HOTPLUG" > /proc/sys/kernel/hotplug
 
-ifconfig $ifname 0.0.0.0 down