base-files: preinit: Fixed sourcing of diag.sh in /etc/preinit. This caused errors...

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

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index d1a6ffd549d3572d14d6abb648e21d2357cc31af..6c6e3b1fe1a7884953efe836d82f6b62422e1fbc 100755 (executable)
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -1,23 +1,44 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-. /etc/diag.sh
 
-failsafe() {
-       lock /tmp/.failsafe
-       ash --login
-}
+pi_ifname=
+pi_ip=192.168.1.1
+pi_broadcast=192.168.1.255
+pi_netmask=255.255.255.0
+
+fs_failsafe_ifname=
+fs_failsafe_ip=192.168.1.1
+fs_failsafe_broadcast=192.168.1.255
+fs_failsafe_netmask=255.255.255.0
+
+fs_failsafe_wait_timeout=2
+
+pi_suppress_stderr="y"
+pi_init_suppress_stderr="y"
+pi_init_path="/bin:/sbin:/usr/bin:/usr/sbin"
+pi_init_cmd="/sbin/init"
+
+. /etc/functions.sh
+. /lib/functions/boot.sh
 
-mount none /proc -t proc
-mount none /sys  -t sysfs
+boot_hook_init preinit_essential
+boot_hook_init preinit_main
+boot_hook_init failsafe
+boot_hook_init initramfs
+boot_hook_init preinit_mount_root
 
-[ -e /etc/preinit.arch ] && . /etc/preinit.arch
+for pi_source_file in /lib/preinit/*; do
+    . $pi_source_file
+done
 
-set_state preinit
+boot_run_hook preinit_essential
 
-mount_root ${FAILSAFE:+failsafe}
+pi_mount_skip_next=false
+pi_jffs2_mount_success=false
+pi_failsafe_net_message=false
 
-eval ${FAILSAFE:+failsafe}
-lock -w /tmp/.failsafe
+boot_run_hook preinit_main
 
-exec /sbin/init