rpms/dhcp/devel dhclient-script,1.14,1.15 dhcp.spec,1.277,1.278

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20951

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Fri Oct 30 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-13
- Make dhclient-script add IPv6 address to interface (#531997)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dhclient-script	19 Sep 2009 06:22:33 -0000	1.14
+++ dhclient-script	30 Oct 2009 09:51:58 -0000	1.15
@@ -405,16 +405,14 @@ dhconfig() {
 dh6config() {
     case "${reason}" in
         BOUND6)
-            if [ -n "${new_ip6_address}" ] ||
-               [ -n "${new_ip6_prefixlen}" ]; then
+            if [ -z "${new_ip6_address}" ] &&
+               [ -z "${new_ip6_prefixlen}" ]; then
                 exit_with_hooks 2
             fi
 
             ip -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
                 dev ${interface} scope global
             make_resolv_conf
-
-            break
             ;;
 
         RENEW6|REBIND6)
@@ -422,19 +420,15 @@ dh6config() {
                [ ! "${new_dhcp6_domain_search}" = "${old_dhcp6_domain_search}" ]; then
                 make_resolv_conf
             fi
-
-            break
             ;;
 
         DEPREF6)
-            if [ -n "${new_ip6_prefixlen}" ]; then
+            if [ -z "${new_ip6_prefixlen}" ]; then
                 exit_with_hooks 2
             fi
 
             ip -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
                 dev ${interface} scope global preferred_lft 0
-
-            break
             ;;
     esac
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- dhcp.spec	13 Oct 2009 10:16:59 -0000	1.277
+++ dhcp.spec	30 Oct 2009 09:51:58 -0000	1.278
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  12%{?dist}
+Release:  13%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # 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.
@@ -481,6 +481,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Oct 30 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-13
+- Make dhclient-script add IPv6 address to interface (#531997)
+
 * Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-12
 - Fix 56dhclient so network comes back after suspend/hibernate (#527641)