index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Dylan Taylor <dylan@dylanmtaylor.com> | 2021-05-20 08:13:57 -0400 |
---|---|---|
committer | Dylan Taylor <dylan@dylanmtaylor.com> | 2021-05-20 08:13:57 -0400 |
commit | 9c8d55dd76171909da27c90944ef9a686f6426cf (patch) | |
tree | 8da5e3a43fc4adf99c78a97a30cb548d02737929 /archinstall | |
parent | f137bc4076ec7e4e0914be466ef403810ab02fca (diff) | |
parent | 86fd64ef8ae804ae26bd02f90dbb780a8151f439 (diff) |
-rw-r--r-- | archinstall/__init__.py | 2 | ||||
-rw-r--r-- | archinstall/lib/general.py | 2 | ||||
-rw-r--r-- | archinstall/lib/networking.py | 2 | ||||
-rw-r--r-- | archinstall/lib/storage.py | 2 |
diff --git a/archinstall/__init__.py b/archinstall/__init__.py index 91e0cb12..ee4748f6 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -51,7 +51,7 @@ def initialize_arguments(): with open(args.config) as file: config = json.load(file) else: # Attempt to load the configuration from the URL. - with urllib.request.urlopen(args.config) as response: + with urllib.request.urlopen(urllib.request.Request(args.config, headers={'User-Agent': 'ArchInstall'})) as response: config = json.loads(response.read()) except Exception as e: print(e) diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py index cec3891a..81793cb8 100644 --- a/archinstall/lib/general.py +++ b/archinstall/lib/general.py @@ -365,4 +365,4 @@ def pid_exists(pid: int): try: return any(subprocess.check_output(['/usr/bin/ps', '--no-headers', '-o', 'pid', '-p', str(pid)]).strip()) except subprocess.CalledProcessError: - return False
\ No newline at end of file + return False diff --git a/archinstall/lib/networking.py b/archinstall/lib/networking.py index eb11a47e..0643c9cf 100644 --- a/archinstall/lib/networking.py +++ b/archinstall/lib/networking.py @@ -10,6 +10,7 @@ from .general import SysCommand from .output import log from .storage import storage + def get_hw_addr(ifname): s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) info = fcntl.ioctl(s.fileno(), 0x8927, struct.pack('256s', bytes(ifname, 'utf-8')[:15])) @@ -35,6 +36,7 @@ def check_mirror_reachable(): return False + def enrich_iface_types(interfaces: dict): result = {} for iface in interfaces: diff --git a/archinstall/lib/storage.py b/archinstall/lib/storage.py index 42214572..4e19e4d4 100644 --- a/archinstall/lib/storage.py +++ b/archinstall/lib/storage.py @@ -11,7 +11,7 @@ storage = { 'PROFILE_PATH': [ './profiles', '~/.config/archinstall/profiles', - os.path.join(os.path.dirname(os.path.abspath(__file__)), 'profiles'), + os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'profiles'), # os.path.abspath(f'{os.path.dirname(__file__)}/../examples') ], 'UPSTREAM_URL': 'https://raw.githubusercontent.com/archlinux/archinstall/master/profiles', |