remove obsolete nvram.overrides (replaced by S05nvram)
authorMike Baker <mbm@openwrt.org>
Tue, 21 Mar 2006 11:10:54 +0000 (11:10 +0000)
committerMike Baker <mbm@openwrt.org>
Tue, 21 Mar 2006 11:10:54 +0000 (11:10 +0000)
SVN-Revision: 3427

openwrt/package/base-files/default/etc/functions.sh
openwrt/package/base-files/default/etc/nvram.overrides [deleted file]

index 80b1792c864be005ebfbdc4f24aab30ec9263814..54b0a906c131b26b77b0a33b0a50678128c1c27d 100755 (executable)
@@ -2,15 +2,6 @@
 
 alias debug=${DEBUG:-:}
 
-# allow env to override nvram
-nvram () {
-  case $1 in
-    get) eval "echo \${NVRAM_$2:-\$(command nvram get $2)}";;
-    *) command nvram $*;;
-  esac
-}
-[ "$FAILSAFE" = "true" ] && . /etc/nvram.overrides
-
 # valid interface?
 if_valid () (
   ifconfig "$1" >&- 2>&- ||
diff --git a/openwrt/package/base-files/default/etc/nvram.overrides b/openwrt/package/base-files/default/etc/nvram.overrides
deleted file mode 100644 (file)
index c965f7d..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# NVRAM overrides
-#
-# This file handles the NVRAM quirks of various hardware.
-# THIS FILE IS NOT A REPLACEMENT FOR NVRAM
-
-# Load sysconf defaults
-[ -f /etc/sysconf ] && . /etc/sysconf
-
-# hacks for wrt54g 1.x hardware
-[  "$(nvram get boardnum)"  = "42" \
--a "$(nvram get boardtype)" = "bcm94710dev" ] && FAILSAFE_ifnames="vlan0 vlan2 eth2"
-
-# hacks for asus wl-500g deluxe
-[  "$(nvram get boardtype)" = "bcm95365r" \
--a "$(nvram get boardnum)" = "45" ] && FAILSAFE_ifnames="vlan0 eth1"
-
-# hacks for wap54g hardware
-[  "$(nvram get boardnum)" = "2" \
--o "$(nvram get boardnum)" = "1024" ] && FAILSAFE_ifnames="eth0 eth1"
-
-# hack for asus wl-500g hardware
-[ "$(nvram get boardnum)" = "asusX" \
--a "$(nvram get boardtype)" = "bcm94710dev" ] && FAILSAFE_ifnames="eth0 eth1 eth2"
-  
-FAILSAFE_ifnames=${FAILSAFE_ifnames:-"vlan0 eth1 eth2"}
-
-# failsafe if reset is held
-[ "$FAILSAFE" = "true" ] && {
-  echo "### YOU ARE IN FAILSAFE MODE ####"
-  NVRAM_lan_ifname="eth0"
-  NVRAM_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"}
-  NVRAM_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"}
-  NVRAM_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}
-  NVRAM_wan_ifname="none"
-  NVRAM_wifi_ifname="none"
-}