[package] base-files: preinit: Fixed sourcing of diag.sh in /etc/preinit. This cause...

[openwrt.git] / package / base-files / files / etc / preinit

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 4e706f1..6c6e3b1 100755 (executable)
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -1,89 +1,44 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-. /etc/diag.sh
-
-failsafe_ip() {
-       ifconfig $ifname 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
-}
+# Copyright (C) 2010 Vertical Communications
 
-failsafe() {
-       [ -n "$ifname" ] && grep "$ifname" /proc/net/dev >/dev/null && {
-               failsafe_ip
-               netmsg 192.168.1.255 "Entering Failsafe!"
-               telnetd -l /bin/login.sh <> /dev/null 2>&1
-       }
-       lock /tmp/.failsafe
-       ash --login
-}
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
-mount proc /proc -t proc
-mount sysfs /sys -t sysfs
+pi_ifname=
+pi_ip=192.168.1.1
+pi_broadcast=192.168.1.255
+pi_netmask=255.255.255.0
 
-size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)&&(mt>l)?mt-l:s}' /proc/meminfo)
-mount tmpfs /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
+fs_failsafe_ifname=
+fs_failsafe_ip=192.168.1.1
+fs_failsafe_broadcast=192.168.1.255
+fs_failsafe_netmask=255.255.255.0
 
-if grep devfs /proc/filesystems > /dev/null; then
-       mount devfs /dev -t devfs
-       M0=/dev/pty/m0
-       M1=/dev/pty/m1
-       HOTPLUG=/sbin/hotplug-call
+fs_failsafe_wait_timeout=2
 
-elif [ -x /sbin/hotplug2 ]; then
-       mount -t tmpfs tmpfs /dev -o size=512K
-       mknod /dev/console c 5 1
-       /sbin/hotplug2 --set-worker /lib/hotplug2/worker_fork.so --set-rules-file /etc/hotplug2-init.rules --no-persistent --set-coldplug-cmd /sbin/udevtrigger
-       /sbin/hotplug2 --set-worker /lib/hotplug2/worker_fork.so --set-rules-file /etc/hotplug2-init.rules --persistent &
-       M0=/dev/ptmx
-       M1=/dev/ptmx
-       HOTPLUG=
+pi_suppress_stderr="y"
+pi_init_suppress_stderr="y"
+pi_init_path="/bin:/sbin:/usr/bin:/usr/sbin"
+pi_init_cmd="/sbin/init"
 
-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
+. /etc/functions.sh
+. /lib/functions/boot.sh
 
-mkdir -p /dev/pts /dev/shm
-mount devpts /dev/pts -t devpts
+boot_hook_init preinit_essential
+boot_hook_init preinit_main
+boot_hook_init failsafe
+boot_hook_init initramfs
+boot_hook_init preinit_mount_root
 
-# 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 && {
-       M0=/dev/console
-       M1=/dev/console
-}
+for pi_source_file in /lib/preinit/*; do
+    . $pi_source_file
+done
 
-exec <$M0 >$M1 2>&0
+boot_run_hook preinit_essential
 
-echo "- preinit -"
-echo "Press CTRL-C for failsafe"
-trap 'FAILSAFE=true' INT
-trap 'FAILSAFE=true' USR1
-[ -e /etc/preinit.arch ] && . /etc/preinit.arch
-set_state preinit
-echo "$HOTPLUG" > /proc/sys/kernel/hotplug
-export FAILSAFE
-eval ${FAILSAFE:+failsafe}
-lock -w /tmp/.failsafe
+pi_mount_skip_next=false
+pi_jffs2_mount_success=false
+pi_failsafe_net_message=false
 
-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
-       }
+boot_run_hook preinit_main
 
-       echo "- init -"
-       
-       exec /sbin/init
-fi