summaryrefslogtreecommitdiffstats
path: root/obsolete-buildroot/sources/openwrt/root/etc
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2004-08-26 19:14:54 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2004-08-26 19:14:54 +0000
commitf4da8cab588284adf82b8b8c4258493a1cc77e10 (patch)
tree096ced9f89cb8aa3c4d26b422b849aaa4cc5cad6 /obsolete-buildroot/sources/openwrt/root/etc
parent6f13c412d16997df8b8e51d53abd0fa604f8201e (diff)
replace resetmon with /proc/sys/reset
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@147 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'obsolete-buildroot/sources/openwrt/root/etc')
-rw-r--r--obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides29
-rwxr-xr-xobsolete-buildroot/sources/openwrt/root/etc/preinit2
2 files changed, 16 insertions, 15 deletions
diff --git a/obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides b/obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides
index e334d7519..f59e78060 100644
--- a/obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides
+++ b/obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides
@@ -1,22 +1,11 @@
# NVRAM overrides
-# This file handles the NVRAM quirks of various hardware
-# this is not a replacement for nvram.
+# This file handles the NVRAM quirks of various hardware.
+#
+# THIS FILE IS NOT A REPLACEMENT FOR NVRAM
# linksys bug has lan doing dhcp; force static
lan_proto="static"
-# failsafe if reset is held
-[ "$FAILSAFE" = "true" ] && {
- echo "### FAILSAFE MODE ####"
- lan_ifname="br0"
- lan_ifnames="vlan0 vlan2 eth1 eth2 eth3"
- lan_ipaddr="192.168.1.1"
- lan_netmask="255.255.255.0"
- lan_hwaddr="00:0B:AD:0A:DD:00"
- wan_ifname="none"
- wifi_ifname="none"
-}
-
# hacks for 1.x hardware
[ "$(nvram get boardnum)" = "42" ] && \
[ "$(nvram get boardtype)" = "bcm94710dev" ] && {
@@ -50,3 +39,15 @@ lan_proto="static"
wan_ifname="vlan1"
wan_proto="dhcp"
}
+
+# failsafe if reset is held
+[ "$FAILSAFE" = "true" ] && {
+ echo "### FAILSAFE MODE ####"
+ lan_ifname="br0"
+ lan_ifnames="vlan0 vlan2 eth1 eth2 eth3"
+ lan_ipaddr="192.168.1.1"
+ lan_netmask="255.255.255.0"
+ lan_hwaddr="00:0B:AD:0A:DD:00"
+ wan_ifname="none"
+ wifi_ifname="none"
+}
diff --git a/obsolete-buildroot/sources/openwrt/root/etc/preinit b/obsolete-buildroot/sources/openwrt/root/etc/preinit
index 1054282e8..62b20d986 100755
--- a/obsolete-buildroot/sources/openwrt/root/etc/preinit
+++ b/obsolete-buildroot/sources/openwrt/root/etc/preinit
@@ -3,7 +3,7 @@ mount none /proc -t proc
insmod diag
echo 0x01 > /proc/sys/diag
sleep 1
-if /sbin/resetmon ; then
+if [ $(cat /proc/sys/reset) = 1 ] ; then
mtd unlock mtd4
mount -t jffs2 /dev/mtdblock/4 /jffs
pivot_root /jffs /jffs/rom