rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f21'

Browse Source
This commit is contained in:
Jiri Popelka 2014-08-26 12:08:58 +02:00
commit e70cc70732
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dhclient-script
View File

@ -563,20 +563,20 @@ add_ipv6_addr_with_DAD() {
for i in $(seq 5); do for i in $(seq 5); do
sleep 1 # give the DAD some time sleep 1 # give the DAD some time
addr=$(ip -6 addr show dev ${interface} \
| grep ${new_ip6_address}/${new_ip6_prefixlen})
# tentative flag == DAD is still not complete # tentative flag == DAD is still not complete
tentative=$(ip -6 addr show dev ${interface} tentative \ tentative=$(echo "${addr}" | grep tentative)
| grep ${new_ip6_address}/${new_ip6_prefixlen})
# dadfailed flag == address is already in use somewhere else # dadfailed flag == address is already in use somewhere else
dadfailed=$(ip -6 addr show dev ${interface} dadfailed \ dadfailed=$(echo "${addr}" | grep dadfailed)
| grep ${new_ip6_address}/${new_ip6_prefixlen})
if [ -n "${dadfailed}" ] ; then if [ -n "${dadfailed}" ] ; then
#ip -6 addr del ${new_ip6_address}/${new_ip6_prefixlen} dev ${interface} # address was added with valid_lft/preferred_lft 'forever', remove it
ip -6 addr del ${new_ip6_address}/${new_ip6_prefixlen} dev ${interface}
exit_with_hooks 3 exit_with_hooks 3
fi fi
if [ -z "${tentative}" ] ; then if [ -z "${tentative}" ] ; then
addr=$(ip -6 addr show dev ${interface} \
| grep ${new_ip6_address}/${new_ip6_prefixlen})
if [ -n "${addr}" ]; then if [ -n "${addr}" ]; then
# DAD is over # DAD is over
return 0 return 0
@ -586,6 +586,7 @@ add_ipv6_addr_with_DAD() {
fi fi
fi fi
done done
return 0
} }
dh6config() { dh6config() {

5
dhcp.spec
View File

@ -18,7 +18,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.3.1 Version: 4.3.1
Release: 5%{?dist} Release: 6%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -646,6 +646,9 @@ done
%doc doc/html/ %doc doc/html/
%changelog %changelog
* Tue Aug 26 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.1-6
- dhclient-script: another improvement of add_ipv6_addr_with_DAD()
* Mon Aug 25 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.1-5 * Mon Aug 25 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.1-5
- spec: use -D with 'install' - spec: use -D with 'install'
- dhclient-script: IPv6 address which fails DAD is auto-removed when it was - dhclient-script: IPv6 address which fails DAD is auto-removed when it was