X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Fpreinit;h=829574f5f1824fe207fba3d7cece2a391c9bc2a6;hp=688fca075e91c82abef2bc79c0b567ef6ac1accc;hb=d13e86d4c2d4c1c8970a20cc1f3214b266f57ed0;hpb=f494bcc2228409eaa5efefca8f0bdad74c76153e

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 688fca075e..829574f5f1 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -1,98 +1,29 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-. /etc/diag.sh
+# Copyright (C) 2006-2016 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
 
-failsafe_ip() {
-	ifconfig $ifname 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
-}
+[ -z "$PREINIT" ] && exec /sbin/init
 
-failsafe() {
-	set_state 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="%PATH%"
 
-mount proc /proc -t proc
-mount sysfs /sys -t sysfs
+. /lib/functions.sh
+. /lib/functions/preinit.sh
+. /lib/functions/system.sh
 
-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
+boot_hook_init preinit_essential
+boot_hook_init preinit_main
+boot_hook_init failsafe
+boot_hook_init initramfs
+boot_hook_init preinit_mount_root
 
-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
+for pi_source_file in /lib/preinit/*; do
+	. $pi_source_file
+done
 
-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=
+boot_run_hook preinit_essential
 
-elif [ -x /sbin/udevd ]; then
-	mount -n -t tmpfs -o mode=0755 udev /dev
-	[ -d /lib/udev/devices ] && cp -af /lib/udev/devices/* /dev/
-	[ -c /dev/console ] || mknod -m 0600 /dev/console c 5 1
-	[ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
-	/sbin/udevd --daemon --resolve-names=never
-	/sbin/udevadm trigger
-	/sbin/udevadm settle
-	M0=/dev/pty/ptmx
-	M1=/dev/pty/ptmx
-	HOTPLUG=
-fi
+pi_mount_skip_next=false
+pi_jffs2_mount_success=false
+pi_failsafe_net_message=false
 
-[ -d /dev/pts ] || mkdir -p /dev/pts
-[ -d /dev/shm ] || mkdir -p /dev/shm
-mount devpts /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 && {
-	M0=/dev/console
-	M1=/dev/console
-}
-
-exec <$M0 >$M1 2>&0
-
-echo "- preinit -"
-set_state preinit
-echo "Press CTRL-C for failsafe"
-trap 'FAILSAFE=true' INT
-trap 'FAILSAFE=true' USR1
-if [ -e /etc/preinit.arch ]; then
-	. /etc/preinit.arch
-else
-	sleep 2
-fi
-echo "$HOTPLUG" > /proc/sys/kernel/hotplug
-export FAILSAFE
-eval ${FAILSAFE:+failsafe}
-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 -"
-
-	exec /sbin/init
-fi
+boot_run_hook preinit_main