From: Felix Fietkau Date: Wed, 4 Jan 2006 23:50:17 +0000 (+0000) Subject: move firstboot to preinit for now (until a better solution is implemented), required... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=00ade4d60cf3ad27f4c4afaa71936f5e19c6099f;p=openwrt%2Fstaging%2Flinusw.git move firstboot to preinit for now (until a better solution is implemented), required by /etc/config/network generator SVN-Revision: 2830 --- 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