summaryrefslogtreecommitdiff
path: root/package/base-files/files
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2014-04-07 09:50:19 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2014-04-07 09:50:19 +0000
commit78f5d480fda013879e3c8cb80e2966d38d5be30a (patch)
tree4060876eb772b8dbc18db4ec05e2ef6092d98084 /package/base-files/files
parentf6235f6ac9324745b65063f8f214037adaf8aa82 (diff)
/lib/functions.sh: move preinit related functions to /lib/functions/preinit.sh
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40404 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files')
-rwxr-xr-xpackage/base-files/files/etc/preinit1
-rwxr-xr-xpackage/base-files/files/lib/functions.sh85
-rw-r--r--package/base-files/files/lib/functions/preinit.sh87
3 files changed, 88 insertions, 85 deletions
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 3fa0d62046..a8662eaf1d 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -24,6 +24,7 @@ pi_init_path="/bin:/sbin:/usr/bin:/usr/sbin"
pi_init_cmd="/sbin/init"
. /lib/functions.sh
+. /lib/functions/preinit.sh
boot_hook_init preinit_essential
boot_hook_init preinit_main
diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index da5d4a0ec5..5e77657f95 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -446,89 +446,4 @@ user_exists() {
grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/passwd
}
-
-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${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 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
-}
-
-pivot() { # <new_root> <old_root>
- /bin/mount -o noatime,move /proc $1/proc && \
- pivot_root $1 $1$2 && {
- /bin/mount -o noatime,move $2/dev /dev
- /bin/mount -o noatime,move $2/tmp /tmp
- /bin/mount -o noatime,move $2/sys /sys 2>&-
- /bin/mount -o noatime,move $2/overlay /overlay 2>&-
- return 0
- }
-}
-
-fopivot() { # <rw_root> <ro_root> <dupe?>
- /bin/mount -o noatime,lowerdir=/,upperdir=$1 -t overlayfs "overlayfs:$1" /mnt
- pivot /mnt $2
-}
-
-ramoverlay() {
- mkdir -p /tmp/root
- /bin/mount -t tmpfs -o noatime,mode=0755 root /tmp/root
- fopivot /tmp/root /rom 1
-}
-
[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh
diff --git a/package/base-files/files/lib/functions/preinit.sh b/package/base-files/files/lib/functions/preinit.sh
new file mode 100644
index 0000000000..db1f298c8b
--- /dev/null
+++ b/package/base-files/files/lib/functions/preinit.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+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${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 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
+}
+
+pivot() { # <new_root> <old_root>
+ /bin/mount -o noatime,move /proc $1/proc && \
+ pivot_root $1 $1$2 && {
+ /bin/mount -o noatime,move $2/dev /dev
+ /bin/mount -o noatime,move $2/tmp /tmp
+ /bin/mount -o noatime,move $2/sys /sys 2>&-
+ /bin/mount -o noatime,move $2/overlay /overlay 2>&-
+ return 0
+ }
+}
+
+fopivot() { # <rw_root> <ro_root> <dupe?>
+ /bin/mount -o noatime,lowerdir=/,upperdir=$1 -t overlayfs "overlayfs:$1" /mnt
+ pivot /mnt $2
+}
+
+ramoverlay() {
+ mkdir -p /tmp/root
+ /bin/mount -t tmpfs -o noatime,mode=0755 root /tmp/root
+ fopivot /tmp/root /rom 1
+}