RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 2253 (#2259) 

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
This commit is contained in:
Daniel Girtler 2023-11-24 17:59:12 +11:00 committed by GitHub
parent f6446323fc
commit b0c8f33de6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/hardware.py
View File

@ -42,7 +42,6 @@ class GfxPackage(Enum):
LibvaMesaDriver = 'libva-mesa-driver'
Mesa = "mesa"
Nvidia = 'nvidia'
NvidiaDKMS = 'nvidia-dkms'
NvidiaOpen = 'nvidia-open'
VulkanIntel = 'vulkan-intel'
VulkanRadeon = 'vulkan-radeon'
@ -110,8 +109,7 @@ class GfxDriver(Enum):
]
case GfxDriver.NvidiaProprietary:
return [
GfxPackage.Nvidia,
GfxPackage.NvidiaDKMS
GfxPackage.Nvidia
]
case GfxDriver.VMOpenSource:
return [

2
archinstall/lib/models/network_configuration.py
View File

@ -133,7 +133,7 @@ class NetworkConfiguration:
case NicType.NM:
installation.add_additional_packages(["networkmanager"])
if profile_config and profile_config.profile:
if profile_config.profile.is_desktop_type_profile():
if profile_config.profile.is_desktop_profile():
installation.add_additional_packages(["network-manager-applet"])
installation.enable_service('NetworkManager.service')
case NicType.MANUAL:

4
archinstall/lib/profile/profiles_handler.py
View File

@ -212,6 +212,7 @@ class ProfileHandler:
if driver is not None:
driver_pkgs = driver.packages()
pkg_names = [p.value for p in driver_pkgs]
for driver_pkg in {GfxPackage.Nvidia, GfxPackage.NvidiaOpen} & set(driver_pkgs):
for kernel in {"linux-lts", "linux-zen"} & set(install_session.kernels):
# Fixes https://github.com/archlinux/archinstall/issues/585
@ -221,6 +222,7 @@ class ProfileHandler:
install_session.add_additional_packages(['dkms', 'xorg-server', 'xorg-xinit', f'{driver_pkg.value}-dkms'])
# Return after first driver match, since it is impossible to use both simultaneously.
return
if 'amdgpu' in driver_pkgs:
# The order of these two are important if amdgpu is installed #808
if 'amdgpu' in install_session.modules:
@ -245,7 +247,7 @@ class ProfileHandler:
profile.install(install_session)
if profile_config.gfx_driver and (profile.is_xorg_type_profile() or profile.is_desktop_type_profile()):
if profile_config.gfx_driver and (profile.is_xorg_type_profile() or profile.is_desktop_profile()):
self.install_gfx_driver(install_session, profile_config.gfx_driver)
if profile_config.greeter: