This patch re-adds the udev and hotplug2 initialization fixes originally
present in /init but was removed when some code was moved from /init to
/etc/preinit in rev 10870. This adds udev initialization and only handles
hotplug2 initialization when hotplug2 is present. This also removes what
seems to be some leftover debug echo output.
Signed-off-by: Yuji Mano <[EMAIL PROTECTED]>
---
package/base-files/files/etc/preinit | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -18,7 +18,7 @@ failsafe() {
}
mount proc /proc -t proc
-mount sysfs /sys -t sysfs
+mount sysfs /sys -t sysfs
size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}'
/proc/meminfo)
mount tmpfs /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
@@ -28,15 +28,24 @@ if grep devfs /proc/filesystems > /dev/n
M0=/dev/pty/m0
M1=/dev/pty/m1
HOTPLUG=/sbin/hotplug-call
-else
+
+elif [ -x /sbin/hotplug ]; then
mount -t tmpfs tmpfs /dev -o size=512K
mknod /dev/console c 5 1
- mkdir /dev/shm
/sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
/sbin/hotplug2 --no-coldplug --persistent --set-rules-file
/etc/hotplug2-init.rules &
M0=/dev/ptmx
M1=/dev/ptmx
HOTPLUG=
+
+elif [ -x /sbin/udevd ]; then
+ mount -n -t tmpfs -o mode=0755 udev /dev
+ /sbin/udevd --daemon
+ /sbin/udevtrigger
+ /sbin/udevsettle
+ M0=/dev/pty/ptmx
+ M1=/dev/pty/ptmx
+ HOTPLUG=
fi
mkdir -p /dev/pts /dev/shm
@@ -52,7 +61,6 @@ dd if=/dev/console of=/dev/null bs=1 cou
exec <$M0 >$M1 2>&0
-echo "- preinit -"
trap 'FAILSAFE=true' USR1
[ -e /etc/preinit.arch ] && . /etc/preinit.arch
set_state preinit
@@ -63,15 +71,12 @@ lock -w /tmp/.failsafe
if [ -z "$INITRAMFS" ]; then
mount_root
[ -f /sysupgrade.tgz ] && {
- echo "- config restore -"
cd /
mv sysupgrade.tgz /tmp
tar xzf /tmp/sysupgrade.tgz
rm -f /tmp/sysupgrade.tgz
sync
}
-
- echo "- init -"
killall hotplug2
exec /sbin/init
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
