Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-11-11 19:11:22 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-11-11 19:11:22 +0000
commit07d70a0a916b3c7ede34671603c1e964a1c7bf30 (patch)
tree7f8e58882ab7db135e90cff9fea278a83a11c571
parent9a1199333a0a00b74f884dfee1b324500d4b8060 (diff)
Added a simple INI handler, and a helper function under Installer().configure_nic() to help with nic configuration. Supports a crude DHCP configuration and a minimal static IP handler.
-rw-r--r--.gitignore2
-rw-r--r--archinstall/lib/installer.py19
-rw-r--r--archinstall/lib/systemd.py40
3 files changed, 61 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5c83c4aa..955e7784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ SAFETY_LOCK
**/**.pkg.*.xz
**/**archinstall-*.tar.gz
**/**.zst
+**/**.network
+**/**.target
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 775de50a..c233a876 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -6,6 +6,7 @@ from .general import *
from .user_interaction import *
from .profiles import Profile
from .mirrors import *
+from .systemd import Networkd
from .output import log, LOG_LEVELS
from .storage import storage
@@ -149,6 +150,24 @@ class Installer():
def arch_chroot(self, cmd, *args, **kwargs):
return self.run_command(cmd)
+ def configure_nic(self, nic, dhcp=True, ip=None, gateway=None, dns=None, *args, **kwargs):
+ if dhcp:
+ conf = Networkd(Match={"Name": nic}, Network={"DHCP": "yes"})
+ else:
+ assert ip
+
+ network = {"Address": ip}
+ if gateway:
+ network["Gateway"] = gateway
+ if dns:
+ assert type(dns) == list
+ network["DNS"] = dns
+
+ conf = Networkd(Match={"Name": nic}, Network=network)
+
+ with open(f"{self.mountpoint}/etc/systemd/network/10-{nic}.network", "a") as netconf:
+ netconf.write(str(conf))
+
def minimal_installation(self):
## Add nessecary packages if encrypting the drive
## (encrypted partitions default to btrfs for now, so we need btrfs-progs)
diff --git a/archinstall/lib/systemd.py b/archinstall/lib/systemd.py
new file mode 100644
index 00000000..edd75098
--- /dev/null
+++ b/archinstall/lib/systemd.py
@@ -0,0 +1,40 @@
+class Ini():
+ def __init__(self, *args, **kwargs):
+ """
+ Limited INI handler for now.
+ Supports multiple keywords through dictionary list items.
+ """
+ self.kwargs = kwargs
+
+ def __str__(self):
+ result = ''
+ first_row_done = False
+ for top_level in self.kwargs:
+ if first_row_done:
+ result += f"\n[{top_level}]\n"
+ else:
+ result += f"[{top_level}]\n"
+ first_row_done = True
+
+ for key, val in self.kwargs[top_level].items():
+ if type(val) == list:
+ for item in val:
+ result += f"{key}={item}\n"
+ else:
+ result += f"{key}={val}\n"
+
+ return result
+
+class Systemd(Ini):
+ def __init__(self, *args, **kwargs):
+ """
+ Placeholder class to do systemd specific setups.
+ """
+ super(Systemd, self).__init__(*args, **kwargs)
+
+class Networkd(Systemd):
+ def __init__(self, *args, **kwargs):
+ """
+ Placeholder class to do systemd-network specific setups.
+ """
+ super(Networkd, self).__init__(*args, **kwargs) \ No newline at end of file