summaryrefslogtreecommitdiffstats
path: root/package/base-files/default
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-01-04 23:50:17 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-01-04 23:50:17 +0000
commit3f7fe8a080572fb3b989b7e86ca6aa9002b6dfae (patch)
tree744caf8a1ad803ea5d0d3a78ce2110b3d1a1c045 /package/base-files/default
parent283e00c3604f6b98b83abefdfbcbf54c148d91b4 (diff)
move firstboot to preinit for now (until a better solution is implemented), required by /etc/config/network generator
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2830 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/default')
-rwxr-xr-xpackage/base-files/default/etc/init.d/S10boot5
-rwxr-xr-xpackage/base-files/default/etc/preinit5
2 files changed, 5 insertions, 5 deletions
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 9dd0beb1c..02fddee7b 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -11,11 +11,6 @@ HOSTNAME=$(nvram get wan_hostname)
HOSTNAME=${HOSTNAME%%.*}
echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
-# automagically run firstboot
-[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
- { mount|grep "on / type jffs2" 1>&-; } || firstboot
-}
-
mkdir -p /var/run
mkdir -p /var/log
touch /var/log/wtmp
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index 88c8920c9..ac9039ca7 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -16,4 +16,9 @@ fi
mount_root ${FAILSAFE:+failsafe}
+# automagically run firstboot
+[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
+ { mount|grep "on / type jffs2" 1>&-; } || firstboot
+}
+
exec /sbin/init