adapt to pr comments

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>

Author: benjamreis

backend.py

@@ -1553,18 +1553,17 @@ def configureNetworking(mounts, admin_iface, admin_bridge, admin_config, hn_conf
     # now we need to write /etc/sysconfig/network
     nfd = open("%s/etc/sysconfig/network" % mounts["root"], "w")
     nfd.write("NETWORKING=yes\n")
-    ipv6_conf = open("%s/etc/sysctl.d/91-net-ipv6.conf" % mounts["root"], "w")
-    if admin_config.modev6:
-        nfd.write("NETWORKING_IPV6=yes\n")
-        util.runCmd2(['chroot', mounts['root'], 'systemctl', 'enable', 'ip6tables'])
-        for i in ['all', 'default']:
-            ipv6_conf.write('net.ipv6.conf.%s.disable_ipv6=0\n' % i)
-    else:
-        nfd.write("NETWORKING_IPV6=no\n")
-        for i in ['all', 'default']:
-            ipv6_conf.write('net.ipv6.conf.%s.disable_ipv6=1\n' % i)
-        netutil.disable_ipv6_module(mounts["root"])
-    ipv6_conf.close()
+    with open("%s/etc/sysctl.d/91-net-ipv6.conf" % mounts["root"], "w") as ipv6_conf:
+        if admin_config.modev6:
+            nfd.write("NETWORKING_IPV6=yes\n")
+            util.runCmd2(['chroot', mounts['root'], 'systemctl', 'enable', 'ip6tables'])
+            for i in ['all', 'default']:
+                ipv6_conf.write('net.ipv6.conf.%s.disable_ipv6=0\n' % i)
+        else:
+            nfd.write("NETWORKING_IPV6=no\n")
+            for i in ['all', 'default']:
+                ipv6_conf.write('net.ipv6.conf.%s.disable_ipv6=1\n' % i)
+            netutil.disable_ipv6_module(mounts["root"])
     nfd.write("IPV6_AUTOCONF=no\n")
     nfd.write('NTPSERVERARGS="iburst prefer"\n')
     nfd.close()

upgrade.py

@@ -489,10 +489,9 @@ def completeUpgrade(self, mounts, prev_install, target_disk, backup_partnum, log
             netutil.disable_ipv6_module(mounts["root"])
         else:
             # Enable IPV6
-            ipv6_conf = open("%s/etc/sysctl.d/91-net-ipv6.conf" % mounts["root"], "w")
-            for i in ['all', 'default']:
-                ipv6_conf.write('net.ipv6.conf.%s.disable_ipv6=0\n' % i)
-            ipv6_conf.close()
+            with open("%s/etc/sysctl.d/91-net-ipv6.conf" % mounts["root"], "w") as ipv6_conf:
+                for i in ['all', 'default']:
+                    ipv6_conf.write('net.ipv6.conf.%s.disable_ipv6=0\n' % i)
 
         # handle the conversion of devices from aacraid to smartpqi
         primary_disk = self.source.getInventoryValue("PRIMARY_DISK")