From 8dde7740ee758ab54a94c663081afae7d5163d6b Mon Sep 17 00:00:00 2001 From: wbx Date: Sat, 10 Sep 2005 17:57:49 +0000 Subject: make - layout, discussed with nbd git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1891 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/package/openwrt/Makefile | 6 +- .../openwrt/files/ar7-2.4/etc/config/network | 31 +++++++ .../openwrt/files/ar7-2.4/etc/network.overrides | 28 ++++++ .../package/openwrt/files/ar7/etc/config/network | 31 ------- .../openwrt/files/ar7/etc/network.overrides | 28 ------ .../openwrt/files/brcm-2.4/etc/config/network | 18 ++++ .../openwrt/files/brcm-2.4/etc/init.d/S05nvram | 102 +++++++++++++++++++++ .../openwrt/files/brcm-2.4/etc/network.overrides | 41 +++++++++ .../openwrt/files/brcm-2.6/etc/config/network | 31 +++++++ .../openwrt/files/brcm-2.6/etc/network.overrides | 26 ++++++ .../package/openwrt/files/brcm/etc/config/network | 18 ---- .../package/openwrt/files/brcm/etc/init.d/S05nvram | 102 --------------------- .../openwrt/files/brcm/etc/network.overrides | 41 --------- .../openwrt/files/soekris-2.4/etc/config/network | 10 ++ .../files/soekris-2.4/etc/network.overrides | 26 ++++++ .../openwrt/files/soekris/etc/config/network | 10 -- .../openwrt/files/soekris/etc/network.overrides | 26 ------ 17 files changed, 316 insertions(+), 259 deletions(-) create mode 100644 target/linux/package/openwrt/files/ar7-2.4/etc/config/network create mode 100644 target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides delete mode 100644 target/linux/package/openwrt/files/ar7/etc/config/network delete mode 100644 target/linux/package/openwrt/files/ar7/etc/network.overrides create mode 100644 target/linux/package/openwrt/files/brcm-2.4/etc/config/network create mode 100755 target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram create mode 100644 target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides create mode 100644 target/linux/package/openwrt/files/brcm-2.6/etc/config/network create mode 100644 target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides delete mode 100644 target/linux/package/openwrt/files/brcm/etc/config/network delete mode 100755 target/linux/package/openwrt/files/brcm/etc/init.d/S05nvram delete mode 100644 target/linux/package/openwrt/files/brcm/etc/network.overrides create mode 100644 target/linux/package/openwrt/files/soekris-2.4/etc/config/network create mode 100644 target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides delete mode 100644 target/linux/package/openwrt/files/soekris/etc/config/network delete mode 100644 target/linux/package/openwrt/files/soekris/etc/network.overrides (limited to 'target/linux') diff --git a/target/linux/package/openwrt/Makefile b/target/linux/package/openwrt/Makefile index 6fa350a9dd..82ceb3d906 100644 --- a/target/linux/package/openwrt/Makefile +++ b/target/linux/package/openwrt/Makefile @@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(TOPDIR)/package/rules.mk IDIR_OPENWRT:=$(PKG_BUILD_DIR)/ipkg -IPKG_OPENWRT:=$(PACKAGE_DIR)/base-files-$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk +IPKG_OPENWRT:=$(PACKAGE_DIR)/base-files-$(BOARD)-$(KERNEL)_$(PKG_RELEASE)_$(ARCH).ipk $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) @@ -33,10 +33,10 @@ $(PKG_BUILD_DIR)/.built: $(IDIR_OPENWRT): $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_OPENWRT) ipkg/base-files-arch.control $(PKG_RELEASE) $(ARCH) - $(SED) s,base-files-arch,base-files-$(BOARD),g $(IDIR_OPENWRT)/CONTROL/control + $(SED) s,base-files-arch,base-files-$(BOARD)-$(KERNEL),g $(IDIR_OPENWRT)/CONTROL/control $(IPKG_OPENWRT): $(IDIR_OPENWRT) - [ -d files/$(BOARD) ] && cp -a files/$(BOARD)/* $(IDIR_OPENWRT)/ + [ -d files/$(BOARD)-$(KERNEL) ] && cp -a files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/ find $(IDIR_OPENWRT) -name CVS | xargs rm -rf find $(IDIR_OPENWRT) -name .svn | xargs rm -rf $(RSTRIP) $(IDIR_OPENWRT) diff --git a/target/linux/package/openwrt/files/ar7-2.4/etc/config/network b/target/linux/package/openwrt/files/ar7-2.4/etc/config/network new file mode 100644 index 0000000000..9487a7426f --- /dev/null +++ b/target/linux/package/openwrt/files/ar7-2.4/etc/config/network @@ -0,0 +1,31 @@ +# Network configuration file +# Uncomment the following statements to change the network configuration + +## LAN configuration +# lan_ifname="br0" +# lan_proto="static" +# lan_ipaddr="192.168.1.1" +# lan_netmask="255.255.255.0" +# lan_gateway="" +# lan_dns="" + +## WAN configuration (PPPoE) +# wan_proto=pppoe +# wan_ifname=ppp0 +# pppoe_atm=1 +# pppoe_ifname=nas0 +# atm_vpi=8 +# atm_vci=35 +# ppp_username=my_username +# ppp_passwd=my_passwd +# ppp_mtu=1492 + +## WAN configuration (PPPoA) +# wan_proto=pppoa +# wan_ifname=ppp0 +# atm_vpi=8 +# atm_vci=35 +# ppp_username=my_username +# ppp_passwd=my_passwd +# ppp_mtu=1500 + diff --git a/target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides b/target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides new file mode 100644 index 0000000000..76c3da3685 --- /dev/null +++ b/target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides @@ -0,0 +1,28 @@ +# 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 + +DEFAULT_lan_proto="static" +DEFAULT_lan_ifname="br0" +DEFAULT_lan_ifnames="eth0" +DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} +DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} +DEFAULT_lan_hwaddr=$(strings /dev/mtdblock/3 | grep -A1 maca | grep :) +DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr%% *} +DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr:-${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}} + +# failsafe if reset is held +[ "$FAILSAFE" = "true" ] && { + echo "### YOU ARE IN FAILSAFE MODE ####" + lan_ifname=${DEFAULT_lan_proto} + lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} + lan_ipaddr=$DEFAULT_lan_ipaddr + lan_netmask=$DEFAULT_lan_netmask + lan_hwaddr=$DEFAULT_lan_hwaddr + wan_ifname="none" + wifi_ifname="none" +} diff --git a/target/linux/package/openwrt/files/ar7/etc/config/network b/target/linux/package/openwrt/files/ar7/etc/config/network deleted file mode 100644 index 9487a7426f..0000000000 --- a/target/linux/package/openwrt/files/ar7/etc/config/network +++ /dev/null @@ -1,31 +0,0 @@ -# Network configuration file -# Uncomment the following statements to change the network configuration - -## LAN configuration -# lan_ifname="br0" -# lan_proto="static" -# lan_ipaddr="192.168.1.1" -# lan_netmask="255.255.255.0" -# lan_gateway="" -# lan_dns="" - -## WAN configuration (PPPoE) -# wan_proto=pppoe -# wan_ifname=ppp0 -# pppoe_atm=1 -# pppoe_ifname=nas0 -# atm_vpi=8 -# atm_vci=35 -# ppp_username=my_username -# ppp_passwd=my_passwd -# ppp_mtu=1492 - -## WAN configuration (PPPoA) -# wan_proto=pppoa -# wan_ifname=ppp0 -# atm_vpi=8 -# atm_vci=35 -# ppp_username=my_username -# ppp_passwd=my_passwd -# ppp_mtu=1500 - diff --git a/target/linux/package/openwrt/files/ar7/etc/network.overrides b/target/linux/package/openwrt/files/ar7/etc/network.overrides deleted file mode 100644 index 76c3da3685..0000000000 --- a/target/linux/package/openwrt/files/ar7/etc/network.overrides +++ /dev/null @@ -1,28 +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 - -DEFAULT_lan_proto="static" -DEFAULT_lan_ifname="br0" -DEFAULT_lan_ifnames="eth0" -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -DEFAULT_lan_hwaddr=$(strings /dev/mtdblock/3 | grep -A1 maca | grep :) -DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr%% *} -DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr:-${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}} - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - lan_ifname=${DEFAULT_lan_proto} - lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} - lan_ipaddr=$DEFAULT_lan_ipaddr - lan_netmask=$DEFAULT_lan_netmask - lan_hwaddr=$DEFAULT_lan_hwaddr - wan_ifname="none" - wifi_ifname="none" -} diff --git a/target/linux/package/openwrt/files/brcm-2.4/etc/config/network b/target/linux/package/openwrt/files/brcm-2.4/etc/config/network new file mode 100644 index 0000000000..ee8e02043a --- /dev/null +++ b/target/linux/package/openwrt/files/brcm-2.4/etc/config/network @@ -0,0 +1,18 @@ +# Network configuration file +# Uncomment the following statements to override the default or nvram config + +## LAN configuration +# lan_ifname="br0" +# lan_proto="static" +# lan_ipaddr="192.168.1.1" +# lan_netmask="255.255.255.0" +# lan_gateway="" +# lan_dns="" + +## WAN configuration (PPPoE) +# wan_proto=pppoe +# wan_ifname=ppp0 +# pppoe_ifname=vlan1 +# ppp_username=my_username +# ppp_passwd=my_passwd +# ppp_mtu=1492 diff --git a/target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram b/target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram new file mode 100755 index 0000000000..0d1300b964 --- /dev/null +++ b/target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram @@ -0,0 +1,102 @@ +# NVRAM setup +# +# This file handles the NVRAM quirks of various hardware. + +. /etc/network.overrides +alias debug=${DEBUG:-:} + +remap () { + for type in lan wifi wan pppoe + do + for s in '' s + do + eval nvram set ${type}_ifname$s=\"$(nvram get ${type}_ifname$s|sed s/$1/$2/g)\" + done + done +} + +nvram_default() { + [ -z "$(nvram get $1)" ] && nvram set "$1=$2" +} + +# linksys bug; remove when not using static configuration for lan +nvram set lan_proto="static" + +# hacks for wrt54g 1.x hardware +[ "$(nvram get boardnum)" = "42" \ +-a "$(nvram get boardtype)" = "bcm94710dev" ] && { + debug "### wrt54g 1.x hack ###" + nvram set vlan1hwname="et0" + nvram set vlan2hwname="et0" + remap eth0 vlan2 + remap eth1 vlan1 +} + +# hacks for asus wl-500g deluxe +[ "$(nvram get boardtype)" = "bcm95365r" \ +-a "$(nvram get boardnum)" = "45" ] && { + debug "### wl-500g deluxe hacks ###" + nvram set vlan0hwname="et0" + nvram set vlan1hwname="et0" + remap eth0.1 vlan0 + remap eth0 vlan1 + + # set up the vlan*ports variables for the asus wl-500g deluxe + # if they don't already exist + nvram_default vlan0ports "1 2 3 4 5*" + nvram_default vlan1ports "0 5" +} + +# hacks for asus wl-300g +[ "$(nvram get productid)" = "WL300g" ] && { + debug "### wl-300g hacks ###" + nvram set lan_ifnames="eth0 eth2" + nvram set wan_ifname="none" +} + +# hacks for asus wl-hdd +[ "$(nvram get productid)" = "WLHDD" ] && { + debug "### wl-hdd hacks ###" + nvram set lan_ifnames="eth1 eth2" + nvram set wan_ifname="none" +} + +# hacks for wap54g hardware +[ "$(nvram get boardnum)" = "2" \ +-o "$(nvram get boardnum)" = "1024" ] && { + debug "### wap54g hack ###" + nvram set wan_ifname="none" +} + +# hacks for buffalo wla2-g54l +[ "$(nvram get boardnum)" = "00" \ +-a "$(nvram get product_name)" = "Product_name" \ +-o "$(nvram get product_name)" = "WLA2-G54L" ] && { + debug "### wla2-g54l hacks ###" + nvram set wan_ifname="none" + nvram set lan_ifnames="vlan0" +} + +# needed at least for wrt54gs v1.1 and wrt54g v2.0, v2.2 +[ \! -z "$(nvram get boardrev)" ] && { + nvram set wl0id=0x4320 +} + +# defaults +nvram_default lan_ifname "br0" +nvram_default lan_ifnames "$FAILSAFE_ifnames" + +nvram_default wan_ifname "vlan1" +nvram_default wan_proto "dhcp" + +nvram_default wl0_ssid OpenWrt +nvram_default wl0_mode ap +nvram_default wl0_infra 1 +nvram_default wl0_radio 1 + +[ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && { + # if default wifi mac, set two higher than the lan mac + nvram set il0macaddr=$(nvram get et0macaddr| + awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}') +} + diff --git a/target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides b/target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides new file mode 100644 index 0000000000..5af02aa4ad --- /dev/null +++ b/target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides @@ -0,0 +1,41 @@ +# 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="vlan1 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"} + +DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} +DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} +DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} + +# failsafe if reset is held +[ "$FAILSAFE" = "true" ] && { + echo "### YOU ARE IN FAILSAFE MODE ####" + NVRAM_lan_ifname="br0" + NVRAM_lan_ifnames=$FAILSAFE_ifnames + NVRAM_lan_ipaddr=DEFAULT_lan_ipaddr + NVRAM_lan_netmask=DEFAULT_lan_netmask + NVRAM_lan_hwaddr=DEFAULT_lan_hwaddr + NVRAM_wan_ifname="none" + NVRAM_wifi_ifname="none" +} diff --git a/target/linux/package/openwrt/files/brcm-2.6/etc/config/network b/target/linux/package/openwrt/files/brcm-2.6/etc/config/network new file mode 100644 index 0000000000..9487a7426f --- /dev/null +++ b/target/linux/package/openwrt/files/brcm-2.6/etc/config/network @@ -0,0 +1,31 @@ +# Network configuration file +# Uncomment the following statements to change the network configuration + +## LAN configuration +# lan_ifname="br0" +# lan_proto="static" +# lan_ipaddr="192.168.1.1" +# lan_netmask="255.255.255.0" +# lan_gateway="" +# lan_dns="" + +## WAN configuration (PPPoE) +# wan_proto=pppoe +# wan_ifname=ppp0 +# pppoe_atm=1 +# pppoe_ifname=nas0 +# atm_vpi=8 +# atm_vci=35 +# ppp_username=my_username +# ppp_passwd=my_passwd +# ppp_mtu=1492 + +## WAN configuration (PPPoA) +# wan_proto=pppoa +# wan_ifname=ppp0 +# atm_vpi=8 +# atm_vci=35 +# ppp_username=my_username +# ppp_passwd=my_passwd +# ppp_mtu=1500 + diff --git a/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides b/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides new file mode 100644 index 0000000000..81801ef5fd --- /dev/null +++ b/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides @@ -0,0 +1,26 @@ +# 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 + +DEFAULT_lan_proto="static" +DEFAULT_lan_ifname="br0" +DEFAULT_lan_ifnames="eth0" +DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} +DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} +DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr:-${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}} + +# failsafe if reset is held +[ "$FAILSAFE" = "true" ] && { + echo "### YOU ARE IN FAILSAFE MODE ####" + lan_ifname=${DEFAULT_lan_proto} + lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} + lan_ipaddr=$DEFAULT_lan_ipaddr + lan_netmask=$DEFAULT_lan_netmask + lan_hwaddr=$DEFAULT_lan_hwaddr + wan_ifname="none" + wifi_ifname="none" +} diff --git a/target/linux/package/openwrt/files/brcm/etc/config/network b/target/linux/package/openwrt/files/brcm/etc/config/network deleted file mode 100644 index ee8e02043a..0000000000 --- a/target/linux/package/openwrt/files/brcm/etc/config/network +++ /dev/null @@ -1,18 +0,0 @@ -# Network configuration file -# Uncomment the following statements to override the default or nvram config - -## LAN configuration -# lan_ifname="br0" -# lan_proto="static" -# lan_ipaddr="192.168.1.1" -# lan_netmask="255.255.255.0" -# lan_gateway="" -# lan_dns="" - -## WAN configuration (PPPoE) -# wan_proto=pppoe -# wan_ifname=ppp0 -# pppoe_ifname=vlan1 -# ppp_username=my_username -# ppp_passwd=my_passwd -# ppp_mtu=1492 diff --git a/target/linux/package/openwrt/files/brcm/etc/init.d/S05nvram b/target/linux/package/openwrt/files/brcm/etc/init.d/S05nvram deleted file mode 100755 index 0d1300b964..0000000000 --- a/target/linux/package/openwrt/files/brcm/etc/init.d/S05nvram +++ /dev/null @@ -1,102 +0,0 @@ -# NVRAM setup -# -# This file handles the NVRAM quirks of various hardware. - -. /etc/network.overrides -alias debug=${DEBUG:-:} - -remap () { - for type in lan wifi wan pppoe - do - for s in '' s - do - eval nvram set ${type}_ifname$s=\"$(nvram get ${type}_ifname$s|sed s/$1/$2/g)\" - done - done -} - -nvram_default() { - [ -z "$(nvram get $1)" ] && nvram set "$1=$2" -} - -# linksys bug; remove when not using static configuration for lan -nvram set lan_proto="static" - -# hacks for wrt54g 1.x hardware -[ "$(nvram get boardnum)" = "42" \ --a "$(nvram get boardtype)" = "bcm94710dev" ] && { - debug "### wrt54g 1.x hack ###" - nvram set vlan1hwname="et0" - nvram set vlan2hwname="et0" - remap eth0 vlan2 - remap eth1 vlan1 -} - -# hacks for asus wl-500g deluxe -[ "$(nvram get boardtype)" = "bcm95365r" \ --a "$(nvram get boardnum)" = "45" ] && { - debug "### wl-500g deluxe hacks ###" - nvram set vlan0hwname="et0" - nvram set vlan1hwname="et0" - remap eth0.1 vlan0 - remap eth0 vlan1 - - # set up the vlan*ports variables for the asus wl-500g deluxe - # if they don't already exist - nvram_default vlan0ports "1 2 3 4 5*" - nvram_default vlan1ports "0 5" -} - -# hacks for asus wl-300g -[ "$(nvram get productid)" = "WL300g" ] && { - debug "### wl-300g hacks ###" - nvram set lan_ifnames="eth0 eth2" - nvram set wan_ifname="none" -} - -# hacks for asus wl-hdd -[ "$(nvram get productid)" = "WLHDD" ] && { - debug "### wl-hdd hacks ###" - nvram set lan_ifnames="eth1 eth2" - nvram set wan_ifname="none" -} - -# hacks for wap54g hardware -[ "$(nvram get boardnum)" = "2" \ --o "$(nvram get boardnum)" = "1024" ] && { - debug "### wap54g hack ###" - nvram set wan_ifname="none" -} - -# hacks for buffalo wla2-g54l -[ "$(nvram get boardnum)" = "00" \ --a "$(nvram get product_name)" = "Product_name" \ --o "$(nvram get product_name)" = "WLA2-G54L" ] && { - debug "### wla2-g54l hacks ###" - nvram set wan_ifname="none" - nvram set lan_ifnames="vlan0" -} - -# needed at least for wrt54gs v1.1 and wrt54g v2.0, v2.2 -[ \! -z "$(nvram get boardrev)" ] && { - nvram set wl0id=0x4320 -} - -# defaults -nvram_default lan_ifname "br0" -nvram_default lan_ifnames "$FAILSAFE_ifnames" - -nvram_default wan_ifname "vlan1" -nvram_default wan_proto "dhcp" - -nvram_default wl0_ssid OpenWrt -nvram_default wl0_mode ap -nvram_default wl0_infra 1 -nvram_default wl0_radio 1 - -[ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && { - # if default wifi mac, set two higher than the lan mac - nvram set il0macaddr=$(nvram get et0macaddr| - awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}') -} - diff --git a/target/linux/package/openwrt/files/brcm/etc/network.overrides b/target/linux/package/openwrt/files/brcm/etc/network.overrides deleted file mode 100644 index 5af02aa4ad..0000000000 --- a/target/linux/package/openwrt/files/brcm/etc/network.overrides +++ /dev/null @@ -1,41 +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="vlan1 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"} - -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - NVRAM_lan_ifname="br0" - NVRAM_lan_ifnames=$FAILSAFE_ifnames - NVRAM_lan_ipaddr=DEFAULT_lan_ipaddr - NVRAM_lan_netmask=DEFAULT_lan_netmask - NVRAM_lan_hwaddr=DEFAULT_lan_hwaddr - NVRAM_wan_ifname="none" - NVRAM_wifi_ifname="none" -} diff --git a/target/linux/package/openwrt/files/soekris-2.4/etc/config/network b/target/linux/package/openwrt/files/soekris-2.4/etc/config/network new file mode 100644 index 0000000000..5682cfe62e --- /dev/null +++ b/target/linux/package/openwrt/files/soekris-2.4/etc/config/network @@ -0,0 +1,10 @@ +# Network configuration file +# Uncomment the following statements to override the default or nvram config + +## LAN configuration +# lan_ifname="br0" +# lan_proto="static" +# lan_ipaddr="192.168.1.1" +# lan_netmask="255.255.255.0" +# lan_gateway="" +# lan_dns="" diff --git a/target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides b/target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides new file mode 100644 index 0000000000..e857d5b5f1 --- /dev/null +++ b/target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides @@ -0,0 +1,26 @@ +# 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 + +DEFAULT_lan_proto="static" +DEFAULT_lan_ifname="br0" +DEFAULT_lan_ifnames="eth0" +DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} +DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} +DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} + +# failsafe if reset is held +[ "$FAILSAFE" = "true" ] && { + echo "### YOU ARE IN FAILSAFE MODE ####" + lan_ifname=${DEFAULT_lan_proto} + lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} + lan_ipaddr=$DEFAULT_lan_ipaddr + lan_netmask=$DEFAULT_lan_netmask + lan_hwaddr=$DEFAULT_lan_hwaddr + wan_ifname="none" + wifi_ifname="none" +} diff --git a/target/linux/package/openwrt/files/soekris/etc/config/network b/target/linux/package/openwrt/files/soekris/etc/config/network deleted file mode 100644 index 5682cfe62e..0000000000 --- a/target/linux/package/openwrt/files/soekris/etc/config/network +++ /dev/null @@ -1,10 +0,0 @@ -# Network configuration file -# Uncomment the following statements to override the default or nvram config - -## LAN configuration -# lan_ifname="br0" -# lan_proto="static" -# lan_ipaddr="192.168.1.1" -# lan_netmask="255.255.255.0" -# lan_gateway="" -# lan_dns="" diff --git a/target/linux/package/openwrt/files/soekris/etc/network.overrides b/target/linux/package/openwrt/files/soekris/etc/network.overrides deleted file mode 100644 index e857d5b5f1..0000000000 --- a/target/linux/package/openwrt/files/soekris/etc/network.overrides +++ /dev/null @@ -1,26 +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 - -DEFAULT_lan_proto="static" -DEFAULT_lan_ifname="br0" -DEFAULT_lan_ifnames="eth0" -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - lan_ifname=${DEFAULT_lan_proto} - lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} - lan_ipaddr=$DEFAULT_lan_ipaddr - lan_netmask=$DEFAULT_lan_netmask - lan_hwaddr=$DEFAULT_lan_hwaddr - wan_ifname="none" - wifi_ifname="none" -} -- cgit v1.2.3