move firstboot to preinit for now (until a better solution is implemented), required...

[openwrt.git] / openwrt / package / base-files / default / etc / preinit

diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit
index ff9bb4b..ac9039c 100755 (executable)
--- a/openwrt/package/base-files/default/etc/preinit
+++ b/openwrt/package/base-files/default/etc/preinit
@@ -3,11 +3,11 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
 insmod diag
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
 insmod diag

-echo 0x01 > /proc/sys/diag
+[ -f /proc/sys/diag ] && echo 0x01 > /proc/sys/diag

 sleep 1
 sleep 1

-if [ ! -f /proc/sys/reset ] || [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
+if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then

        export FAILSAFE=true
        export FAILSAFE=true

-       [ "$(nvram get boot_wait)" != "on" ] && {
+       [ -x /usr/sbin/nvram -a "$(nvram get boot_wait)" != "on" ] && {

                nvram set boot_wait=on
                nvram commit
        }
                nvram set boot_wait=on
                nvram commit
        }


@@ -16,4 +16,9 @@ fi
 
 mount_root ${FAILSAFE:+failsafe}
 
 
 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
 exec /sbin/init