diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-30 18:23:43 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-30 18:23:43 +0000 |
| commit | d156518f0872807bfde07b1948e9426f1f3b6dac (patch) | |
| tree | 5fed1caa9f80787eed0f74c7725451bc46b138c7 /package/base-files/files/usr | |
| parent | 9232721abcfec679e07d4278f6fac8f837c5c953 (diff) | |
| download | upstream-d156518f0872807bfde07b1948e9426f1f3b6dac.tar.gz upstream-d156518f0872807bfde07b1948e9426f1f3b6dac.tar.bz2 upstream-d156518f0872807bfde07b1948e9426f1f3b6dac.zip | |
[package] base-files:
- use add_dns() and remove_dns() for when changing resolv.conf.auto for static or dhcp interfaces
- force 0644 permissions when creating resolv.conf.auto, fixes dnsmasq permissions denied problem with pppd interfaces
- revert dns servers in /sbin/ifdown
- bump package revision
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21638 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/usr')
| -rwxr-xr-x | package/base-files/files/usr/share/udhcpc/default.script | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script index ceabf4bf3a..39527778ad 100755 --- a/package/base-files/files/usr/share/udhcpc/default.script +++ b/package/base-files/files/usr/share/udhcpc/default.script @@ -139,21 +139,21 @@ setup_interface () { } # DNS - config_get old_dns "$ifc" dns + old_dns=$(uci_get_state network "$ifc" dns) + old_domain=$(uci_get_state network "$ifc" dnsdomain) user_dns=$(uci_get "network.$ifc.dns") [ -n "$user_dns" ] && dns="$user_dns" - [ -n "$dns" ] && [ ! -s "${RESOLV_CONF}" -o "$dns" != "$old_dns" ] && { + [ -n "$dns" ] && [ "$dns" != "$old_dns" -o -n "$user_dns" ] && { echo "udhcpc: setting dns servers: $dns" - echo -n > "${RESOLV_CONF}.tmp" - for i in $dns ; do - echo "nameserver $i" >> "${RESOLV_CONF}.tmp" - done - ${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp" - mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF" - - change_state network "$ifc" dnsdomain "$domain" - change_state network "$ifc" dns "$dns" + add_dns "$ifc" $dns + + [ -n "$domain" ] && [ "$domain" != "$old_domain" ] && { + echo "udhcpc: setting dns domain: $domain" + sed -i -e "${old_domain:+/^search $old_domain$/d; }/^search $domain$/d" "${RESOLV_CONF}" + echo "search $domain" >> "${RESOLV_CONF}" + change_state network "$ifc" dnsdomain "$domain" + } } [ -n "$ifc" ] || return |