aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-11-07 12:45:57 +0000
committerJohn Crispin <john@openwrt.org>2013-11-07 12:45:57 +0000
commit76506e7fa4ea2c641382eaf86255c23078ba504b (patch)
treeb863f4ddc97cc0f53a4cf044d03013982bcfcc90 /package/base-files/files
parent3de4bdc36fa150a14d738210639c9723be422c9e (diff)
downloadupstream-76506e7fa4ea2c641382eaf86255c23078ba504b.tar.gz
upstream-76506e7fa4ea2c641382eaf86255c23078ba504b.tar.bz2
upstream-76506e7fa4ea2c641382eaf86255c23078ba504b.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> SVN-Revision: 38670
Diffstat (limited to 'package/base-files/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 ] || {