suspect umount may be causing reboot issues

[openwrt.git] / openwrt / target / default / target_skeleton / etc / nvram.overrides

diff --git a/openwrt/target/default/target_skeleton/etc/nvram.overrides b/openwrt/target/default/target_skeleton/etc/nvram.overrides
index 82c1590..8132c08 100644 (file)
--- a/openwrt/target/default/target_skeleton/etc/nvram.overrides
+++ b/openwrt/target/default/target_skeleton/etc/nvram.overrides
@@ -6,11 +6,6 @@
 # Load sysconf defaults
 [ -f /etc/sysconf ] && . /etc/sysconf
 
 # Load sysconf defaults
 [ -f /etc/sysconf ] && . /etc/sysconf
 

-[ "$(nvram get boardnum)"  = "asusX" ] && \
-  [ "$(nvram get boardtype)"  = "bcm94710dev" ] && {
-  asus=1
-}
-

 # linksys bug; remove when not using static configuration for lan
 NVRAM_lan_proto="static"
 
 # linksys bug; remove when not using static configuration for lan
 NVRAM_lan_proto="static"
 


@@ -54,8 +49,9 @@ NVRAM_lan_proto="static"
 }
 
 # hack for asus wl-500g hardware
 }
 
 # hack for asus wl-500g hardware

-[ $asus ] && {
-    FAILSAFE_lan_ifnames="eth0 eth2"
+[ "$(nvram get boardnum)"  = "asusX" ] && \
+[ "$(nvram get boardtype)"  = "bcm94710dev" ] && {
+  FAILSAFE_lan_ifnames="eth0 eth2"

 }
 
 # hacks for asus wl-500g deluxe
 }
 
 # hacks for asus wl-500g deluxe


@@ -65,7 +61,9 @@ NVRAM_lan_proto="static"
   NVRAM_vlan0hwname="et0"
   NVRAM_vlan1hwname="et0"
   NVRAM_lan_ifnames="vlan0 eth1"
   NVRAM_vlan0hwname="et0"
   NVRAM_vlan1hwname="et0"
   NVRAM_lan_ifnames="vlan0 eth1"

-  NVRAM_wan_ifname="vlan1"
+  [ "$(nvram get wan_ifname)" = "eth0.1" ] && {
+    NVRAM_wan_ifname="vlan1"
+  }

 }
 
 # defaults if lan_ifname is missing
 }
 
 # defaults if lan_ifname is missing