summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2014-12-04 13:50:41 +0100
committerJiří Klimeš <jklimes@redhat.com>2014-12-04 14:42:55 +0100
commit155d5bc5a156a180c242b772abaf8c458aa67007 (patch)
tree39fa96fd8d3cf86558f4eca44d427f967a4745c7
parentcb025dba5b39ba40474d9dbb23fa651dc9aa8e01 (diff)
downloadNetworkManager-jk/ipv6-assume-rh1170530.tar.gz
core: don't bounce disable_ipv6 when assuming connections (rh #1170530)jk/ipv6-assume-rh1170530
Don't call set_nm_ipv6ll(self, TRUE) on any assumed connections since it would bounce disable_ipv6, which would break IPv6 connectivity. That is critical, for example, for installations via NFS. Fixes: d37b7bed305dbed7b5351038850ef6bbb7ed9c59 https://bugzilla.redhat.com/show_bug.cgi?id=1170530 Related: https://bugzilla.redhat.com/show_bug.cgi?id=1052157
-rw-r--r--src/devices/nm-device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index f56cf2e52a..169db19dfb 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -4390,7 +4390,7 @@ act_stage3_ip6_config_start (NMDevice *self,
* IPv6LL if this is not an assumed connection, since assumed connections
* will already have IPv6 set up.
*/
- if (!nm_device_uses_generated_assumed_connection (self))
+ if (!nm_device_uses_assumed_connection (self))
set_nm_ipv6ll (self, TRUE);
/* Re-enable IPv6 on the interface */