aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-11-07 12:45:57 +0000
committerJohn Crispin <blogic@openwrt.org>2013-11-07 12:45:57 +0000
commita0a713c12f86bf37ae5080472811a02f9e294ee8 (patch)
treed0bad8dc5c3ce3895431a78bf3d42e7d26346bf4 /package/base-files
parentc986cd615cacdeb26a941fbd8b933223b5cb2ab1 (diff)
downloadmaster-187ad058-a0a713c12f86bf37ae5080472811a02f9e294ee8.tar.gz
master-187ad058-a0a713c12f86bf37ae5080472811a02f9e294ee8.tar.bz2
master-187ad058-a0a713c12f86bf37ae5080472811a02f9e294ee8.zip
base-files: Make /etc/init.d/boot restartable
Only reload hostname and timezone config on /etc/init.d/boot restart. Module loading and basic boot setup is only done during boot. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38670 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot10
1 files changed, 7 insertions, 3 deletions
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index aad59e25da..ffcc9f7adf 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -31,6 +31,11 @@ apply_uci_config() {
}
start() {
+ config_load system
+ config_foreach system_config system
+}
+
+boot() {
[ -f /proc/mounts ] || /sbin/mount_root
[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
[ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
@@ -63,9 +68,8 @@ start() {
# temporary hack until configd exists
/sbin/reload_config
-
- config_load system
- config_foreach system_config system
+
+ start
# create /dev/root if it doesn't exist
[ -e /dev/root -o -h /dev/root ] || {