summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2007-03-08 19:57:02 +0000
committerDavid Cantrell <dcantrell@redhat.com>2007-03-08 19:57:02 +0000
commite5ff54e3d340a9f857643c9d1a6f55dd648f7a5c (patch)
treee3605b459c4586dc8281f2e2e012fa4cfd203bf3
parentb4177cc4c2b9905ed4d2af0a745bbfa6f9281048 (diff)
downloadanaconda-e5ff54e3d340a9f857643c9d1a6f55dd648f7a5c.tar.gz
anaconda-e5ff54e3d340a9f857643c9d1a6f55dd648f7a5c.tar.xz
anaconda-e5ff54e3d340a9f857643c9d1a6f55dd648f7a5c.zip
* loader2/net.c (doDhcp): Need DHCPv6_DISABLE set as well as
DHCPv6_DISABLE_ADDRESSES when auto neighbor discovery is selected for IPv6 (#230941, #230949).
-rw-r--r--ChangeLog6
-rw-r--r--loader2/net.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d8e96518f..f5be0303e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-08 David Cantrell <dcantrell@redhat.com>
+
+ * loader2/net.c (doDhcp): Need DHCPv6_DISABLE set as well as
+ DHCPv6_DISABLE_ADDRESSES when auto neighbor discovery is selected for
+ IPv6 (#230941, #230949).
+
2007-03-08 Chris Lumens <clumens@redhat.com>
* kickstart.py (Raid): Subclass from F7_Raid instead.
diff --git a/loader2/net.c b/loader2/net.c
index c30c7e02e..d552b332b 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -1346,7 +1346,7 @@ char *doDhcp(struct networkDeviceConfig *dev) {
if (!dev->noipv6 && dev->ipv6method == IPV6_AUTO_METHOD) {
/* IPv6 enabled -and- auto neighbor discovery selected */
- pref |= DHCPv6_DISABLE_ADDRESSES;
+ pref |= DHCPv6_DISABLE | DHCPv6_DISABLE_ADDRESSES;
} else if (dev->noipv6 || dev->ipv6method == IPV6_MANUAL_METHOD) {
/* IPv6 disabled entirely -or- manual IPv6 config selected */
pref |= DHCPv6_DISABLE;