[dhcp] dhclient-script: backport upstream changes
Jiří Popelka
jpopelka at fedoraproject.org
Fri Jul 1 14:07:40 UTC 2011
commit 9b3b26027bc7bba43edd3195903d52e339e1b094
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Fri Jul 1 15:04:42 2011 +0200
dhclient-script: backport upstream changes
dhclient-script | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/dhclient-script b/dhclient-script
index 4f9dff9..6a093e9 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -186,9 +186,19 @@ make_resolv_conf() {
echo "options ${RES_OPTIONS}" >> ${rscf}
fi
+ shopt -s nocasematch
for nameserver in ${new_dhcp6_name_servers} ; do
- echo "nameserver ${nameserver}" >> ${rscf}
+ # If the nameserver has a link-local address
+ # add a <zone_id> (interface name) to it.
+ if [[ "$nameserver" =~ ^fe80:: ]]
+ then
+ zone_id="%${interface}"
+ else
+ zone_id=
+ fi
+ echo "nameserver ${nameserver}$zone_id" >> ${rscf}
done
+ shopt -u nocasematch
change_resolv_conf ${rscf}
rm -f ${rscf}
More information about the scm-commits
mailing list