Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile17
-rw-r--r--archinstall/lib/mirrors.py2
-rw-r--r--archinstall/lib/networking.py11
3 files changed, 29 insertions, 1 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..53e8b008
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+PREFIX ?= /usr/local
+
+all:
+
+V=$(shell git describe)
+
+dist:
+ git archive --format=tar --prefix=archinstall32-$(V)/ $(V) | gzip -9 > archinstall32-$(V).tar.gz
+ gpg --detach-sign --use-agent archinstall32-$(V).tar.gz
+
+upload:
+ scp archinstall32-$(V).tar.gz archinstall32-$(V).tar.gz.sig sources.archlinux32.org:sources/
+
+.PHONY: dist upload
diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index c9094669..18ffffcd 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -303,7 +303,7 @@ def list_mirrors() -> Dict[str, List[str]]:
with pathlib.Path('/etc/pacman.d/mirrorlist').open('r') as fp:
mirrorlist = fp.read()
else:
- url = "https://archlinux.org/mirrorlist/?protocol=https&protocol=http&ip_version=4&ip_version=6&use_mirror_status=on"
+ url = "https://archlinux32.org/mirrorlist/?protocol=https&protocol=http&ip_version=4&ip_version=6&use_mirror_status=on"
try:
mirrorlist = fetch_data_from_url(url)
except ValueError as err:
diff --git a/archinstall/lib/networking.py b/archinstall/lib/networking.py
index fb26bd3d..bfc4b7d5 100644
--- a/archinstall/lib/networking.py
+++ b/archinstall/lib/networking.py
@@ -43,6 +43,17 @@ def update_keyring() -> bool:
return False
+# TODO: this should be a function maybe upstream taking a parameter.. copy pasting for now..
+def update_keyring32() -> bool:
+ log("Updating archlinux32-keyring ...", level=logging.INFO)
+ if run_pacman("-Sy --noconfirm archlinux32-keyring").exit_code == 0:
+ return True
+
+ elif os.geteuid() != 0:
+ log("update_keyring32() uses 'pacman -Sy archlinux32-keyring' which requires root.", level=logging.ERROR, fg="red")
+
+ return False
+
def enrich_iface_types(interfaces: Union[Dict[str, Any], List[str]]) -> Dict[str, str]:
result = {}