| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/__init__.py | 1 | ||||
| -rw-r--r-- | archinstall/lib/networking.py | 20 | ||||
| -rw-r--r-- | archinstall/lib/profiles.py | 16 |
diff --git a/archinstall/__init__.py b/archinstall/__init__.py index 7042322c..69e98ec7 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -6,3 +6,4 @@ from .lib.installer import * from .lib.profiles import * from .lib.luks import * from .lib.mirrors import * +from .lib.networking import *
\ No newline at end of file diff --git a/archinstall/lib/networking.py b/archinstall/lib/networking.py new file mode 100644 index 00000000..ae4126a9 --- /dev/null +++ b/archinstall/lib/networking.py @@ -0,0 +1,20 @@ +import fcntl +import socket +import struct +from collections import OrderedDict + +from .exceptions import * + +def getHwAddr(ifname): + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + info = fcntl.ioctl(s.fileno(), 0x8927, struct.pack('256s', bytes(ifname, 'utf-8')[:15])) + return ':'.join('%02x' % b for b in info[18:24]) + +def list_interfaces(skip_loopback=True): + interfaces = OrderedDict() + for index, iface in socket.if_nameindex(): + if skip_loopback and iface == 'lo': continue + + mac = getHwAddr(iface).replace(':', '-') + interfaces[mac] = iface + return interfaces diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py index 47d6eaf8..b63a26c4 100644 --- a/archinstall/lib/profiles.py +++ b/archinstall/lib/profiles.py @@ -1,8 +1,9 @@ -import os, urllib.request, urllib.parse, ssl, json +import os, urllib.request, urllib.parse, ssl, json, re import importlib.util, sys from collections import OrderedDict from .general import multisplit, sys_command, log from .exceptions import * +from .networking import * UPSTREAM_URL = 'https://raw.githubusercontent.com/Torxed/archinstall/master/profiles' @@ -14,19 +15,28 @@ def grab_url_data(path): response = urllib.request.urlopen(safe_path, context=ssl_context) return response.read() -def list_profiles(base='./profiles/'): +def list_profiles(base='./profiles/', filter_irrelevant_macs=True): # TODO: Grab from github page as well, not just local static files + if filter_irrelevant_macs: + local_macs = list_interfaces() + cache = {} for root, folders, files in os.walk(base): for file in files: + tailored = False if os.path.splitext(file)[1] == '.py': + if len(mac := re.findall('(([a-zA-z0-9]{2}[-:]){5}([a-zA-z0-9]{2}))', file)): + if filter_irrelevant_macs and mac[0][0] not in local_macs:: + continue + tailored = True + description = '' with open(os.path.join(root, file), 'r') as fh: first_line = fh.readline() if first_line[0] == '#': description = first_line[1:].strip() - cache[file] = {'path' : os.path.join(root, file), 'description' : description} + cache[file] = {'path' : os.path.join(root, file), 'description' : description, 'tailored' : tailored} break return cache |