qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-23 08:54:43 +02:00
Code

[backfire] merge r24020

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24024 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-11-17 19:19:02 +00:00
parent 83c889fd99
commit 478d861ebd
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=43.9 PKG_RELEASE:=43.10
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host PKG_BUILD_DEPENDS:=opkg/host

7
package/base-files/files/lib/network/config.sh
View File

@ -228,16 +228,17 @@ setup_interface_static() {
config_get ip6addr "$config" ip6addr config_get ip6addr "$config" ip6addr
[ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1 [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
local gateway ip6gw dns bcast local gateway ip6gw dns bcast metric
config_get gateway "$config" gateway config_get gateway "$config" gateway
config_get ip6gw "$config" ip6gw config_get ip6gw "$config" ip6gw
config_get dns "$config" dns config_get dns "$config" dns
config_get bcast "$config" broadcast config_get bcast "$config" broadcast
config_get metric "$config" metric
[ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}" [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
[ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr" [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
[ -z "$gateway" ] || $DEBUG route add default gw "$gateway" dev "$iface" [ -z "$gateway" ] || $DEBUG route add default gw "$gateway" ${metric:+metric $metric} dev "$iface"
[ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" dev "$iface" [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" ${metric:+metric $metric} dev "$iface"
[ -z "$dns" ] || add_dns "$config" $dns [ -z "$dns" ] || add_dns "$config" $dns
config_get type "$config" TYPE config_get type "$config" TYPE

4
package/base-files/files/usr/share/udhcpc/default.script
View File

@ -19,6 +19,7 @@ setup_interface () {
local old_dns local old_dns
local user_dns local user_dns
local user_router local user_router
local user_metric
[ -n "$ifc" ] && { [ -n "$ifc" ] && {
old_ip="$(uci_get_state network "$ifc" ipaddr)" old_ip="$(uci_get_state network "$ifc" ipaddr)"
@ -43,6 +44,7 @@ setup_interface () {
change_state network "$ifc" lease_gateway "$router" change_state network "$ifc" lease_gateway "$router"
old_router="$(uci_get_state network "$ifc" gateway)" old_router="$(uci_get_state network "$ifc" gateway)"
user_router="$(uci_get network "$ifc" gateway)" user_router="$(uci_get network "$ifc" gateway)"
user_metric="$(uci_get network "$ifc" metric)"
[ -n "$user_router" ] && router="$user_router" [ -n "$user_router" ] && router="$user_router"
} }
@ -51,7 +53,7 @@ setup_interface () {
local valid_gw="" local valid_gw=""
for i in $router ; do for i in $router ; do
route add default gw $i dev $interface route add default gw $i ${user_metric:+metric $user_metric} dev $interface
valid_gw="${valid_gw:+$valid_gw|}$i" valid_gw="${valid_gw:+$valid_gw|}$i"
done done