diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-01-04 23:50:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-01-04 23:50:17 +0000 |
| commit | d6a73d30bd8a704067094d28fd535711ceec0190 (patch) | |
| tree | 744caf8a1ad803ea5d0d3a78ce2110b3d1a1c045 /package/base-files | |
| parent | ae353e0bf74d18f7ba19d3f376306063092059e6 (diff) | |
| download | upstream-d6a73d30bd8a704067094d28fd535711ceec0190.tar.gz upstream-d6a73d30bd8a704067094d28fd535711ceec0190.tar.bz2 upstream-d6a73d30bd8a704067094d28fd535711ceec0190.zip | |
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')
| -rwxr-xr-x | package/base-files/default/etc/init.d/S10boot | 5 | ||||
| -rwxr-xr-x | package/base-files/default/etc/preinit | 5 |
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 9dd0beb1c7..02fddee7ba 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 88c8920c94..ac9039ca71 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 |