From 3186def53fa133a2111ea2cb8a0c7685bd91f7d3 Mon Sep 17 00:00:00 2001 From: BenjiReis Date: Wed, 5 Apr 2023 10:29:13 +0200 Subject: [PATCH] netinstall okj Signed-off-by: BenjiReis --- netinterface.py | 17 +++++++++++++---- tui/network.py | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/netinterface.py b/netinterface.py index b61b3c65..e0053d7e 100644 --- a/netinterface.py +++ b/netinterface.py @@ -176,7 +176,7 @@ def writeRHStyleInterface(self, iface): f = open('/etc/sysconfig/network-scripts/ifcfg-%s' % iface_vlan, 'w') f.write("DEVICE=%s\n" % iface_vlan) f.write("ONBOOT=yes\n") - if self.mode == self.DHCP or self.modev6 == self.DHCP: + if self.mode == self.DHCP: f.write("BOOTPROTO=dhcp\n") f.write("PERSISTENT_DHCLIENT=1\n") else: @@ -193,16 +193,21 @@ def writeRHStyleInterface(self, iface): f.write("GATEWAY=%s\n" % self.gateway) if self.modev6: - f.write("NETWORKING_IPV6=yes\n") + with open('/etc/sysconfig/network', 'w') as net_conf: + net_conf.write("NETWORKING_IPV6=yes\n") f.write("IPV6INIT=yes\n") + f.write("IPV6_DEFROUTE=yes\n") + f.write("IPV6_DEFAULTDEV=%s\n" % iface_vlan) f.write("IPV6_AUTOCONF=yes\n" if self.modev6 == self.Autoconf else "IPV6_AUTOCONF=no\n") + if self.modev6 == self.DHCP: f.write("DHCPV6C=yes\n") + f.write("PERSISTENT_DHCLIENT_IPV6=yes\n") + f.write("IPV6_FORCE_ACCEPT_RA=yes\n") elif self.modev6 == self.Static: f.write("IPV6ADDR=%s\n" % self.ipv6addr) if self.ipv6_gateway: - prefix = self.ipv6addr.split("/")[1] - f.write("IPV6_DEFAULTGW=%s/%s\n" % (self.ipv6_gateway, prefix)) + f.write("IPV6_DEFAULTGW=%s\n" % (self.ipv6_gateway)) if self.vlan: f.write("VLAN=yes\n") @@ -379,6 +384,10 @@ def __init__(self, mode, hwaddr, ipaddr=None, netmask=None, gateway=None, dns=No if is_static: assert ipaddr and netmask ipv6addr = ipaddr + "/" + netmask + if dns == '': + dns = None + elif isinstance(dns, str): + dns = [ dns ] self.dns = dns self.domain = domain diff --git a/tui/network.py b/tui/network.py index f590c9f2..aff016f9 100644 --- a/tui/network.py +++ b/tui/network.py @@ -216,7 +216,7 @@ def dhcp_change(): answers.ipv6addr = answers_ipv6.ipv6addr answers.ipv6_gateway = answers_ipv6.ipv6_gateway if answers_ipv6.dns != None: - answers.dns = answers_ipv6.dns if answers.dns == None else answers.dns + "," + answers_ipv6.dns + answers.dns = answers_ipv6.dns if answers.dns == None else answers.dns + answers_ipv6.dns return RIGHT_FORWARDS, answers