aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorDaniel Dickinson <crazycshore@gmail.com>2010-09-23 13:58:05 +0000
committerDaniel Dickinson <crazycshore@gmail.com>2010-09-23 13:58:05 +0000
commit18b473ca9b3a1d050285af6c5d1640fafc5e0ecd (patch)
tree3a7e67349a8a9e5ad2cf07ef8aa837b6062fb909 /package/base-files
parent19723d09c279f2dad7546ae56a5d081984e3d229 (diff)
downloadupstream-18b473ca9b3a1d050285af6c5d1640fafc5e0ecd.tar.gz
upstream-18b473ca9b3a1d050285af6c5d1640fafc5e0ecd.tar.bz2
upstream-18b473ca9b3a1d050285af6c5d1640fafc5e0ecd.zip
base/block-extroot, base/block-mount: Modified preinit and block-extroot and block-mount so that use of block-mount and block-extroot do not require that block-extroot, block-mount, nor the kernel modules they depend, on are required to included in the image. That is block-extroot and dependencies may now be installed as modules onto the jffs2 part of a squashfs system and it will work. In addition packages which are installed into the jffs2 of a squashfs system may now affect preinit, so long as they do not require execution of commands that occur before the merging of the jffs2 and built-in (squashfs) preinit scripts is done.
Thanks jow for the preinit merge stuff! SVN-Revision: 23110
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/etc/functions.sh21
-rwxr-xr-xpackage/base-files/files/etc/preinit12
-rw-r--r--package/base-files/files/lib/functions/boot.sh77
3 files changed, 83 insertions, 27 deletions
diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
index c5df49970b..acea617530 100755
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -292,4 +292,25 @@ service_kill() {
done
}
+
+pi_include() {
+ if [ -f "/tmp/overlay/$1" ]; then
+ . "/tmp/overlay/$1"
+ elif [ -f "$1" ]; then
+ . "$1"
+ elif [ -d "/tmp/overlay/$1" ]; then
+ for src_script in /tmp/overlay/$1/*.sh; do
+ . "$src_script"
+ done
+ elif [ -d "$1" ]; then
+ for src_script in $1/*.sh; do
+ . "$src_script"
+ done
+ else
+ echo "WARNING: $1 not found"
+ return 1
+ fi
+ return 0
+}
+
[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 56c02e4674..9e629ab814 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -5,12 +5,6 @@
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
. /etc/diag.sh
-preinit_essential_hook=
-preinit_main_hook=
-failsafe_hook=
-initramfs_hook=
-preinit_mount_root_hook=
-
pi_ifname=
pi_ip=192.168.1.1
pi_broadcast=192.168.1.255
@@ -28,8 +22,14 @@ 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
+boot_hook_init preinit_essential
+boot_hook_init preinit_main
+boot_hook_init failsafe
+boot_hook_init initramfs
+boot_hook_init preinit_mount_root
for pi_source_file in /lib/preinit/*; do
. $pi_source_file
diff --git a/package/base-files/files/lib/functions/boot.sh b/package/base-files/files/lib/functions/boot.sh
index 91ab9306e1..fc93eba49d 100644
--- a/package/base-files/files/lib/functions/boot.sh
+++ b/package/base-files/files/lib/functions/boot.sh
@@ -6,19 +6,66 @@ mount() {
/bin/busybox mount "$@"
}
+boot_hook_splice_start() {
+ export -n PI_HOOK_SPLICE=1
+}
+
+boot_hook_splice_finish() {
+ local hook
+ for hook in $PI_STACK_LIST; do
+ local v; eval "v=\${${hook}_splice:+\$${hook}_splice }$hook"
+ export -n "${hook}=${v% }"
+ export -n "${hook}_splice="
+ done
+ export -n PI_HOOK_SPLICE=
+}
+
+boot_hook_init() {
+ local hook="${1}_hook"
+ export -n "PI_STACK_LIST=${PI_STACK_LIST:+$PI_STACK_LIST }$hook"
+ export -n "$hook="
+}
+
boot_hook_add() {
- local hook="${1}_hook"
- local value="$2"
- local sep=" "
-
- eval "$hook=\"\${$hook:+\${$hook}\${value:+\$sep}}\$value\""
+ local hook="${1}_hook${PI_HOOK_SPLICE:+_splice}"
+ local func="${2}"
+
+ [ -n "$func" ] && {
+ local v; eval "v=\$$hook"
+ export -n "$hook=${v:+$v }$func"
+ }
+}
+
+boot_hook_shift() {
+ local hook="${1}_hook"
+ local rvar="${2}"
+
+ local v; eval "v=\$$hook"
+ [ -n "$v" ] && {
+ local first="${v%% *}"
+
+ [ "$v" != "${v#* }" ] && \
+ export -n "$hook=${v#* }" || \
+ export -n "$hook="
+
+ export -n "$rvar=$first"
+ return 0
+ }
+
+ return 1
}
boot_run_hook() {
- local boot_func
- for boot_func in $(eval "echo \"\$${1}_hook\""); do
- $boot_func "$1" "$2"
- done
+ local hook="$1"
+ local func
+
+ while boot_hook_shift "$hook" func; do
+ local ran; eval "ran=\$PI_RAN_$func"
+ [ -n "$ran" ] || {
+ export -n "PI_RAN_$func=1"
+ $func "$1" "$2"
+ }
+ done
}
find_mtd_part() {
@@ -99,15 +146,3 @@ ramoverlay() {
fopivot /tmp/root /rom 1
}
-pi_include() {
- if [ -f "/tmp/overlay/$1" ]; then
- . "/tmp/overlay/$1"
- elif [ -f "$1" ]; then
- . "$1"
- else
- echo "WARNING: $1 not found"
- return 1
- fi
- return 0
-}
-