diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-04 23:50:17 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-04 23:50:17 +0000 |
| commit | 4bb342946e09b8aabe702770055ec09985e78d1e (patch) | |
| tree | cf3aa8826586c075bc8f603cbfc54d25aa2cf2e0 | |
| parent | 81ec17e00492190f1c3566794c0f567aa34d439a (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@2830 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | openwrt/package/base-files/default/etc/init.d/S10boot | 5 | ||||
| -rwxr-xr-x | openwrt/package/base-files/default/etc/preinit | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openwrt/package/base-files/default/etc/init.d/S10boot b/openwrt/package/base-files/default/etc/init.d/S10boot index 9dd0beb1c7..02fddee7ba 100755 --- a/openwrt/package/base-files/default/etc/init.d/S10boot +++ b/openwrt/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/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit index 88c8920c94..ac9039ca71 100755 --- a/openwrt/package/base-files/default/etc/preinit +++ b/openwrt/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 |