qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

port wan_device changes from whiterussian to kamikaze

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2993 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2006-01-16 03:14:59 +00:00
parent 9b74fa0d6c
commit 23e86550c9
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig
View File

@@ -88,10 +88,10 @@ END {
print "# pppoe: PPP over Ethernet"
print "# pptp: Point-to-Point tunneling Protocol"
print "# for pppoe and pptp you need to use wan_ifname=\"ppp0\""
print "# and {pppoe,pptp}ifname=\"" c["wan_ifname"] "\")"
print ""
print "wan_proto=dhcp"
p("wan_ifname")
print "wan_device=\"" c["wan_ifname"] "\""
print "# wan_ipaddr=\"192.168.0.2\""
print "# wan_netmask=\"255.255.255.0\""
print "# wan_gateway=\"192.168.0.1\""
@@ -99,8 +99,6 @@ END {
print ""
print "## PPP over Ethernet and PPTP"
print "# wan_ifname=\"ppp0\""
print "# pppoe_ifname=\"" c["wan_ifname"] "\""
print "# pptp_ifname=\"" c["wan_ifname"] "\""
print "# pptp_server_ip=\"192.168.0.1\""
}
' > /etc/config/network

26
target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
View File

@@ -107,6 +107,14 @@ case "$(nvram get productid)" in
nvram set lan_ifnames="eth1 eth2"
nvram set wan_ifname="none"
;;
*)
# wl-500g defaults. these are placed here, because WL-HDD and WL-300g
# might have the same nvram settings.
[ "$(nvram get boardnum)" = "asusX" \
-a "$(nvram get boardtype)" = "bcm94710dev" ] && {
nvram_default wan_device "eth1"
}
;;
esac
# hacks for wap54g hardware
@@ -130,21 +138,12 @@ esac
nvram_default wl0id 0x4320
}
WAN_PROTO="$(nvram get wan_proto)"
[ "$WAN_PROTO" = "pptp" \
-o "$WAN_PROTO" = "pppoe" ] && {
WAN_IFNAME="$(nvram get wan_ifname)"
[ "${WAN_IFNAME%%[0-9]*}" = "ppp" ] || {
nvram set wan_ifname=ppp0
nvram set ${WAN_PROTO}_ifname="$WAN_IFNAME"
}
}
# defaults
nvram_default lan_ifname "br0"
nvram_default lan_ifnames "$FAILSAFE_ifnames"
nvram_default wan_ifname "vlan1"
nvram_default wan_device "vlan1"
nvram_default wan_proto "dhcp"
nvram_default wl0_ssid OpenWrt
@@ -152,6 +151,13 @@ nvram_default wl0_mode ap
nvram_default wl0_infra 1
nvram_default wl0_radio 1
WAN_PROTO="$(nvram get wan_proto)"
WAN_IFNAME="$(nvram get wan_ifname)"
case "$WAN_PROTO" in
pp*) [ "${WAN_IFNAME%%[0-9]*}" = "ppp" ] || nvram set wan_ifname=ppp0;;
*) [ "${WAN_IFNAME%%[0-9]*}" = "ppp" ] && nvram set wan_ifname="$(nvram get wan_device)";;
esac
[ "$(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|