Merge branch 'master' of github.com:Torxed/archinstall into improved-logging

5 files changed, 135 insertions, 3 deletions

diff --git a/archinstall/__init__.py b/archinstall/__init__.py
index 174c6885..ee2d0361 100644
--- a/archinstall/__init__.py
+++ b/archinstall/__init__.py
@@ -12,3 +12,4 @@ from .lib.services import *
 from .lib.packages import *
 from .lib.output import *
 from .lib.storage import *
+from .lib.hardware import *
\ No newline at end of file
diff --git a/archinstall/lib/exceptions.py b/archinstall/lib/exceptions.py
index 2a1cae14..84e6a766 100644
--- a/archinstall/lib/exceptions.py
+++ b/archinstall/lib/exceptions.py
@@ -7,4 +7,6 @@ class ProfileError(BaseException):
 class SysCallError(BaseException):
 	pass
 class ProfileNotFound(BaseException):
+	pass
+class HardwareIncompatibilityError(BaseException):
 	pass
\ No newline at end of file
diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
new file mode 100644
index 00000000..93eb560f
--- /dev/null
+++ b/archinstall/lib/hardware.py
@@ -0,0 +1,36 @@
+import os
+from .general import sys_command
+from .networking import list_interfaces, enrichIfaceTypes
+
+def hasWifi():
+	if 'WIRELESS' in enrichIfaceTypes(list_interfaces().values()).values():
+		return True
+	return False
+
+def hasUEFI():
+	return os.path.isdir('/sys/firmware/efi')
+
+def graphicsDevices():
+	cards = {}
+	for line in sys_command(f"lspci"):
+		if b' VGA ' in line:
+			_, identifier = line.split(b': ',1)
+			cards[identifier.strip().lower().decode('UTF-8')] = line
+	return cards
+
+def hasNvidiaGraphics():
+	if [x for x in graphicsDevices() if 'nvidia' in x]:
+		return True
+	return False
+
+def hasAmdGraphics():
+	if [x for x in graphicsDevices() if 'amd' in x]:
+		return True
+	return False
+
+def hasIntelGraphics():
+	if [x for x in graphicsDevices() if 'intel' in x]:
+		return True
+	return False
+
+# TODO: Add more identifiers
\ No newline at end of file
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 2ea5c60e..99c5506b 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -1,4 +1,4 @@
-import os, stat, time
+import os, stat, time, shutil
 
 from .exceptions import *
 from .disk import *
@@ -53,6 +53,7 @@ class Installer():
 		}
 
 		self.base_packages = base_packages.split(' ')
+		self.post_base_install = []
 		storage['session'] = self
 
 		self.partition = partition
@@ -186,6 +187,47 @@ class Installer():
 		with open(f"{self.mountpoint}/etc/systemd/network/10-{nic}.network", "a") as netconf:
 			netconf.write(str(conf))
 
+	def copy_ISO_network_config(self, enable_services=False):
+		# Copy (if any) iwd password and config files
+		if os.path.isdir('/var/lib/iwd/'):
+			if (psk_files := glob.glob('/var/lib/iwd/*.psk')):
+				if not os.path.isdir(f"{self.mountpoint}/var/lib/iwd"):
+					os.makedirs(f"{self.mountpoint}/var/lib/iwd")
+
+				if enable_services:
+					# If we haven't installed the base yet (function called pre-maturely)
+					if self.helper_flags.get('base', False) is False:
+						self.base_packages.append('iwd')
+						# This function will be called after minimal_installation() 
+						# as a hook for post-installs. This hook is only needed if
+						# base is not installed yet.
+						def post_install_enable_iwd_service(*args, **kwargs):
+							self.enable_service('iwd')
+							self.enable_service('systemd-networkd')
+							self.enable_service('systemd-resolved')
+
+						self.post_base_install.append(post_install_enable_iwd_service)
+					# Otherwise, we can go ahead and add the required package
+					# and enable it's service:
+					else:
+						self.pacstrap('iwd')
+						self.enable_service('iwd')
+						self.enable_service('systemd-networkd')
+						self.enable_service('systemd-resolved')
+
+				for psk in psk_files:
+					shutil.copy2(psk, f"{self.mountpoint}/var/lib/iwd/{os.path.basename(psk)}")
+
+		# Copy (if any) systemd-networkd config files
+		if (netconfigurations := glob.glob('/etc/systemd/network/*')):
+			if not os.path.isdir(f"{self.mountpoint}/etc/systemd/network/"):
+				os.makedirs(f"{self.mountpoint}/etc/systemd/network/")
+
+			for netconf_file in netconfigurations:
+				shutil.copy2(netconf_file, f"{self.mountpoint}/etc/systemd/network/{os.path.basename(netconf_file)}")
+
+		return True
+
 	def minimal_installation(self):
 		## Add nessecary packages if encrypting the drive
 		## (encrypted partitions default to btrfs for now, so we need btrfs-progs)
@@ -224,6 +266,12 @@ class Installer():
 			sys_command(f'/usr/bin/arch-chroot {self.mountpoint} mkinitcpio -p linux')
 
 		self.helper_flags['base'] = True
+
+		# Run registered post-install hooks
+		for function in self.post_base_install:
+			self.log(f"Running post-installation hook: {function}", level=LOG_LEVELS.Info)
+			function(self)
+
 		return True
 
 	def add_bootloader(self, bootloader='systemd-bootctl'):
diff --git a/archinstall/lib/networking.py b/archinstall/lib/networking.py
index 4829a58b..882bcff3 100644
--- a/archinstall/lib/networking.py
+++ b/archinstall/lib/networking.py
@@ -1,8 +1,11 @@
+import os
 import fcntl
 import socket
 import struct
 from collections import OrderedDict
-
+from .exceptions import *
+from .general import sys_command
+from .storage import storage
 
 def getHwAddr(ifname):
 	s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -19,5 +22,47 @@ def list_interfaces(skip_loopback=True):
 		interfaces[mac] = iface
 	return interfaces
 
+def enrichIfaceTypes(interfaces :dict):
+	result = {}
+	for iface in interfaces:
+		if os.path.isdir(f"/sys/class/net/{iface}/bridge/"):
+			result[iface] = 'BRIDGE'
+		elif os.path.isfile(f"/sys/class/net/{iface}/tun_flags"):
+			# ethtool -i {iface}
+			result[iface] = 'TUN/TAP'
+		elif os.path.isdir(f"/sys/class/net/{iface}/device"):
+			if os.path.isdir(f"/sys/class/net/{iface}/wireless/"):
+				result[iface] = 'WIRELESS'
+			else:
+				result[iface] = 'PHYSICAL'
+		else:
+			result[iface] = 'UNKNOWN'
+	return result
+
 def get_interface_from_mac(mac):
-	return list_interfaces().get(mac.lower(), None)
\ No newline at end of file
+	return list_interfaces().get(mac.lower(), None)
+
+def wirelessScan(interface):
+	interfaces = enrichIfaceTypes(list_interfaces().values())
+	if interfaces[interface] != 'WIRELESS':
+		raise HardwareIncompatibilityError(f"Interface {interface} is not a wireless interface: {interfaces}")
+
+	sys_command(f"iwctl station {interface} scan")
+
+	if not '_WIFI' in storage:
+		storage['_WIFI'] = {}
+	if not interface in storage['_WIFI']:
+		storage['_WIFI'][interface] = {}
+
+	storage['_WIFI'][interface]['scanning'] = True
+
+# TOOD: Full WiFi experience might get evolved in the future, pausing for now 2021-01-25
+def getWirelessNetworks(interface):
+	# TODO: Make this oneliner pritter to check if the interface is scanning or not.
+	if not '_WIFI' in storage or interface not in storage['_WIFI'] or storage['_WIFI'][interface].get('scanning', False) is False:
+		import time
+		wirelessScan(interface)
+		time.sleep(5)
+
+	for line in sys_command(f"iwctl station {interface} get-networks"):
+		print(line)
\ No newline at end of file