diff options
| author | cshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-07 02:52:02 +0000 |
|---|---|---|
| committer | cshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-07 02:52:02 +0000 |
| commit | 4e5d6449f66eb7b5a253be36c7d5f0e974e15613 (patch) | |
| tree | 1e2ff83a32f77845080fa9eb5babd5ebc490579a | |
| parent | 0be37efeae0a902c35ba5790b8395e468315f75e (diff) | |
[package] base-files: preinit: Fixed sourcing of diag.sh in /etc/preinit. This caused errors due to frequent use of /proc/cpuinfo to determine board name to pick led layout. Now diag.sh (which only defines set_state and any helper functions) is sourced by a proper preinit function during preinit_main, which is after /proc has been brought up, unlike in /etc/preinit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27501 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/files/etc/preinit | 1 | ||||
| -rw-r--r-- | package/base-files/files/lib/preinit/02_default_set_state | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index 9e629ab814..6c6e3b1fe1 100755 --- a/package/base-files/files/etc/preinit +++ b/package/base-files/files/etc/preinit @@ -3,7 +3,6 @@ # Copyright (C) 2010 Vertical Communications export PATH=/bin:/sbin:/usr/bin:/usr/sbin -. /etc/diag.sh pi_ifname= pi_ip=192.168.1.1 diff --git a/package/base-files/files/lib/preinit/02_default_set_state b/package/base-files/files/lib/preinit/02_default_set_state new file mode 100644 index 0000000000..df43395726 --- /dev/null +++ b/package/base-files/files/lib/preinit/02_default_set_state @@ -0,0 +1,7 @@ +#!/bin/sh + +define_default_set_state() { + . /etc/diag.sh +} + +boot_hook_add preinit_main define_default_set_state |