hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

base-files: - restore device, ifname and aliases state in dhcp script - make sure that resolv.conf.tmp is written once at least for statically configured dns 

SVN-Revision: 15753
lede-17.01
Jo-Philipp Wich 2009-05-10 15:53:02 +00:00
parent 6fc1c45b63
commit 33c38fba27
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ setup_interface () {
user_dns=$(uci_get "network.$ifc.dns") user_dns=$(uci_get "network.$ifc.dns")
[ -n "$user_dns" ] && dns="$user_dns" [ -n "$user_dns" ] && dns="$user_dns"
[ -n "$dns" ] && [ "$dns" != "$old_dns" ] && { [ -n "$dns" ] && [ ! -s "${RESOLV_CONF}.tmp" -o "$dns" != "$old_dns" ] && {
echo "udhcpc: setting dns servers: $dns" echo "udhcpc: setting dns servers: $dns"
echo -n > "${RESOLV_CONF}.tmp" echo -n > "${RESOLV_CONF}.tmp"
for i in $dns ; do for i in $dns ; do
@ -110,7 +110,14 @@ for ifc in $interfaces; do
deconfig) deconfig)
ifconfig "$interface" 0.0.0.0 ifconfig "$interface" 0.0.0.0
env -i ACTION="ifdown" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface env -i ACTION="ifdown" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
config_get device "$ifc" device
config_get ifname "$ifc" ifname
config_get aliases "$ifc" aliases
uci_revert_state network "$ifc" uci_revert_state network "$ifc"
[ -n "$device" ] && uci_set_state network "$ifc" device "$device"
[ -n "$ifname" ] && uci_set_state network "$ifc" ifname "$ifname"
[ -n "$aliases" ] && uci_set_state network "$ifc" aliases "$aliases"
;; ;;
renew) renew)
setup_interface update setup_interface update