]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
addons: address: don't reset ip addrgen on dhcp intf
authorJulien Fortin <julien@cumulusnetworks.com>
Tue, 23 Oct 2018 10:15:17 +0000 (12:15 +0200)
committerJulien Fortin <julien@cumulusnetworks.com>
Thu, 13 Dec 2018 22:43:57 +0000 (14:43 -0800)
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
ifupdown2/addons/address.py

index 627a3ce9175f66c82d908656438ff864e5ac0707..9e3d7603dd9f2889ad918b9949cdb76cbe2f7a59 100644 (file)
@@ -770,6 +770,9 @@ class address(moduleBase):
             # no need to go further during perfmode (boot)
             return
 
+        if not user_configured_ipv6_addrgen and ifaceobj.addr_method == 'dhcp':
+            return
+
         if not user_configured_ipv6_addrgen:
             # if user didn't configure ipv6-addrgen, should we reset to default?
             user_configured_ipv6_addrgen = self.get_attr_default_value('ipv6-addrgen')