X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fbase-files%2Ffiles%2Fetc%2Fpreinit;h=829574f5f1824fe207fba3d7cece2a391c9bc2a6;hb=d13e86d4c2d4c1c8970a20cc1f3214b266f57ed0;hp=452209ff9094e42ea7540d66152cda507128b277;hpb=1e38527a525ca2e4dbe3a53dad63669773d3d15c;p=openwrt%2Fopenwrt.git

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 452209ff90..829574f5f1 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -1,75 +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() {
-	[ -n "$ifname" ] && grep "$ifname" /proc/net/dev >/dev/null && {
-		failsafe_ip
-		netmsg 192.168.1.255 "Entering Failsafe!"
-		telnetd -l /bin/login <> /dev/null 2>&1
-	}
-	lock /tmp/.failsafe
-	ash --login
-}
+export PATH="%PATH%"
 
-mount none /proc -t proc
-mount none /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:s}' /proc/meminfo)
-mount none /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 none /dev -t devfs
-	M0=/dev/pty/m0
-	M1=/dev/pty/m1
-	HOTPLUG=/sbin/hotplug-call
-else
-	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=
-fi
+for pi_source_file in /lib/preinit/*; do
+	. $pi_source_file
+done
 
-mkdir -p /dev/pts /dev/shm
-mount none /dev/pts -t devpts
+boot_run_hook preinit_essential
 
-# 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
-}
+pi_mount_skip_next=false
+pi_jffs2_mount_success=false
+pi_failsafe_net_message=false
 
-exec <$M0 >$M1 2>&0
-
-echo "- preinit -"
-trap 'FAILSAFE=true' USR1
-[ -e /etc/preinit.arch ] && . /etc/preinit.arch
-set_state preinit
-echo "$HOTPLUG" > /proc/sys/kernel/hotplug
-eval ${FAILSAFE:+failsafe}
-lock -w /tmp/.failsafe
-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
+boot_run_hook preinit_main