set boot_wait to on in the earliest possible moment. this makes webupgrade safer...

SVN-Revision: 1356

diff --git a/openwrt/target/default/target_skeleton/etc/init.d/rcS b/openwrt/target/default/target_skeleton/etc/init.d/rcS
index e6daddc5935c9fd5b6920680d2b613d81a400062..08bd9ed717362ef0a3a39efcb17eb154779025fb 100755 (executable)
--- a/openwrt/target/default/target_skeleton/etc/init.d/rcS
+++ b/openwrt/target/default/target_skeleton/etc/init.d/rcS
@@ -1,7 +1,13 @@
 #!/bin/sh
 syslogd -C 16
 klogd
-${FAILSAFE:+telnetd -l /bin/login; ifup lan; exit}
+if [ "$FAILSAFE" = "true" ];then 
+       insmod $(head -1 /etc/modules)
+       ifconfig lo 127.0.0.1 up
+       ifconfig eth0 192.168.1.1 netmask 255.255.255.0 up
+       telnetd -l /bin/login
+       exit
+fi
 
 for i in /etc/init.d/S*; do
   $i start 2>&1

diff --git a/openwrt/target/default/target_skeleton/etc/preinit b/openwrt/target/default/target_skeleton/etc/preinit
index 7a02e31215568330dcd7568fe8c1f69f864702e7..061673035cb375463e3176d2df23545e2cc70497 100755 (executable)
--- a/openwrt/target/default/target_skeleton/etc/preinit
+++ b/openwrt/target/default/target_skeleton/etc/preinit
@@ -1,4 +1,8 @@
 #!/bin/sh
+[ "$(/usr/sbin/nvram get boot_wait)" != "on" ] && {
+       /usr/sbin/nvram set boot_wait=on
+       /usr/sbin/nvram commit
+}
 mount none /proc -t proc
 insmod diag
 echo 0x01 > /proc/sys/diag

diff --git a/openwrt/target/utils/src/trx.c b/openwrt/target/utils/src/trx.c
index 79a04026ea2775ba329aef8e970cd68d39e3ba84..6f9fa4168752e9d60e8c730b93996b9a9d125709 100644 (file)
--- a/openwrt/target/utils/src/trx.c
+++ b/openwrt/target/utils/src/trx.c
@@ -62,7 +62,7 @@ uint32_t crc32buf(char *buf, size_t len);
 
 #define TRX_MAGIC      0x30524448      /* "HDR0" */
 #define TRX_VERSION    1
-#define TRX_MAX_LEN    0x3A0000
+#define TRX_MAX_LEN    0x5A0000
 #define TRX_NO_HEADER  1               /* Do not write TRX header */   
 
 struct trx_header {