ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-06-24 02:03:47 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 21638
This commit is contained in:
Jo-Philipp Wich
2010-05-30 18:23:43 +00:00
parent 44062d09b4
commit 261d41a906
4 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"
add_dns "$ifc" $dns
change_state network "$ifc" dnsdomain "$domain"
change_state network "$ifc" dns "$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