Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-06-04 15:07:42 +0200
committerAnton Hvornum <anton@hvornum.se>2021-06-04 15:07:42 +0200
commit7d60287a3d24303a4e4518b75058ffd2f1feca8d (patch)
treea641fa6ea284ff677b549f00c471dcdd1f501dc3 /profiles
parent515cd4daf01d1239843530093bdae876f4d7f841 (diff)
parent7a40f1dc0bf130847e7deba55f11cb0b7319d6a2 (diff)
Merged in changes from master
Diffstat (limited to 'profiles')
-rw-r--r--profiles/desktop.py2
-rw-r--r--profiles/minimal.py2
-rw-r--r--profiles/server.py2
-rw-r--r--profiles/sway.py6
-rw-r--r--profiles/xorg.py10
5 files changed, 15 insertions, 7 deletions
diff --git a/profiles/desktop.py b/profiles/desktop.py
index 631c7f76..73df9256 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -4,6 +4,8 @@ import archinstall
is_top_level_profile = True
+__description__ = 'Provides a selection of desktop environments and tiling window managers, e.g. gnome, kde, sway'
+
# New way of defining packages for a profile, which is iterable and can be used out side
# of the profile to get a list of "what packages will be installed".
__packages__ = [
diff --git a/profiles/minimal.py b/profiles/minimal.py
index 13cfd05a..c7df517c 100644
--- a/profiles/minimal.py
+++ b/profiles/minimal.py
@@ -2,6 +2,8 @@
is_top_level_profile = True
+__description__ = 'A very basic installation that allows you to customize Arch Linux as you see fit.'
+
def _prep_function(*args, **kwargs):
"""
diff --git a/profiles/server.py b/profiles/server.py
index 704c8efe..79aa9481 100644
--- a/profiles/server.py
+++ b/profiles/server.py
@@ -6,6 +6,8 @@ import archinstall
is_top_level_profile = True
+__description__ = 'Provides a selection of various server packages to install and enable, e.g. httpd, nginx, mariadb'
+
available_servers = [
"cockpit",
"docker",
diff --git a/profiles/sway.py b/profiles/sway.py
index 9afc047d..b0ff8c19 100644
--- a/profiles/sway.py
+++ b/profiles/sway.py
@@ -25,7 +25,7 @@ def _prep_function(*args, **kwargs):
other code in this stage. So it's a safe way to ask the user
for more input before any other installer steps start.
"""
- __builtins__["_gfx_driver_packages"] = archinstall.select_driver()
+ archinstall.storage["gfx_driver_packages"] = archinstall.select_driver()
return True
@@ -34,7 +34,7 @@ def _prep_function(*args, **kwargs):
# through importlib.util.spec_from_file_location("sway", "/somewhere/sway.py")
# or through conventional import sway
if __name__ == "sway":
- if "nvidia" in _gfx_driver_packages:
+ if "nvidia" in archinstall.storage.get("gfx_driver_packages", None):
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.")
@@ -43,4 +43,4 @@ if __name__ == "sway":
archinstall.storage['installation_session'].add_additional_packages(__packages__)
# Install the graphics driver packages
- archinstall.storage['installation_session'].add_additional_packages(_gfx_driver_packages)
+ archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', None))}")
diff --git a/profiles/xorg.py b/profiles/xorg.py
index b8fb2cbb..ce13664d 100644
--- a/profiles/xorg.py
+++ b/profiles/xorg.py
@@ -4,6 +4,8 @@ import archinstall
is_top_level_profile = True
+__description__ = 'Installs a minimal system as well as xorg and graphics drivers.'
+
__packages__ = [
'dkms',
'xorg-server',
@@ -22,7 +24,7 @@ def _prep_function(*args, **kwargs):
for more input before any other installer steps start.
"""
- __builtins__['_gfx_driver_packages'] = archinstall.select_driver()
+ archinstall.storage["gfx_driver_packages"] = archinstall.select_driver()
# TODO: Add language section and/or merge it with the locale selected
# earlier in for instance guided.py installer.
@@ -35,13 +37,13 @@ def _prep_function(*args, **kwargs):
# or through conventional import xorg
if __name__ == 'xorg':
try:
- if "nvidia" in _gfx_driver_packages:
+ if "nvidia" in archinstall.storage.get("gfx_driver_packages", None):
if "linux-zen" in archinstall.storage['installation_session'].base_packages or "linux-lts" in archinstall.storage['installation_session'].base_packages:
archinstall.storage['installation_session'].add_additional_packages("dkms") # I've had kernel regen fail if it wasn't installed before nvidia-dkms
archinstall.storage['installation_session'].add_additional_packages("xorg-server xorg-xinit nvidia-dkms")
else:
- archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(_gfx_driver_packages)}")
+ archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', None))}")
else:
- archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(_gfx_driver_packages)}")
+ archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', None))}")
except:
archinstall.storage['installation_session'].add_additional_packages("xorg-server xorg-xinit") # Prep didn't run, so there's no driver to install