Merge latest changes from master

2 files changed, 9 insertions, 3 deletions

diff --git a/.github/workflows/iso-build.yaml b/.github/workflows/iso-build.yaml
index acef87fb..797629b0 100644
--- a/.github/workflows/iso-build.yaml
+++ b/.github/workflows/iso-build.yaml
@@ -9,7 +9,6 @@ on:
       - main # In case we adopt this convention in the future
   pull_request:
     paths-ignore:
-    - '.github/**'
     - 'docs/**'
     - '**.editorconfig'
     - '**.gitignore'
@@ -29,7 +28,11 @@ jobs:
     - run: find .
     - run: cat /etc/os-release
     - run: mkdir -p /tmp/archlive/airootfs/root/archinstall-git; cp -r . /tmp/archlive/airootfs/root/archinstall-git
-    - run: echo "pip uninstall archinstall -y; cd archinstall-git; python setup.py install; echo 'Type python -m archinstall to launch archinstall'" > /tmp/archlive/airootfs/root/.zprofile
+    - run: echo "pip uninstall archinstall -y; cd archinstall-git; python setup.py install" > /tmp/archlive/airootfs/root/.zprofile
+    - run: echo "echo \"This is an unofficial ISO for the development and testing of archinstall. No support will be provided.\"" >> /tmp/archlive/airootfs/root/.zprofile
+    - run: echo "echo \"This ISO was built from Git SHA $GITHUB_SHA\"" >> /tmp/archlive/airootfs/root/.zprofile
+    - run: echo "echo \"Type archinstall to launch the installer.\"" >> /tmp/archlive/airootfs/root/.zprofile
+    - run: cat /tmp/archlive/airootfs/root/.zprofile
     - run: pacman -Sy; pacman --noconfirm -S git archiso
     - run: cp -r /usr/share/archiso/configs/releng/* /tmp/archlive
     - run: echo -e "git\npython\npython-pip\npython-setuptools" >> /tmp/archlive/packages.x86_64 
diff --git a/profiles/sway.py b/profiles/sway.py
index f132df33..c3a6e31a 100644
--- a/profiles/sway.py
+++ b/profiles/sway.py
@@ -12,7 +12,10 @@ def _prep_function(*args, **kwargs):
 	for more input before any other installer steps start.
 	"""
 	if "nvidia" in _gfx_driver_packages:
-		raise archinstall.lib.exceptions.HardwareIncompatibilityError("Sway does not support the proprietary nvidia drivers")
+		choice = input("The proprietary Nvidia driver is not supported by Sway. It is likely that you will run into issues. Continue anyways? [y/N] ")
+		if choice.lower() in ("n", ""):
+			raise archinstall.lib.exceptions.HardwareIncompatibilityError("Sway does not support the proprietary nvidia drivers.")
+
 	__builtins__['_gfx_driver_packages'] = archinstall.select_driver()
 
 	return True