Skip to content

Commit 2038e68

Browse files
authored
1 parent 12c8a5c commit 2038e68

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

archinstall/lib/hardware.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class GfxPackage(Enum):
5151
Xf86VideoAmdgpu = 'xf86-video-amdgpu'
5252
Xf86VideoAti = 'xf86-video-ati'
5353
Xf86VideoNouveau = 'xf86-video-nouveau'
54-
Xf86VideoVmware = 'xf86-video-vmware'
5554
XorgServer = 'xorg-server'
5655
XorgXinit = 'xorg-xinit'
5756

@@ -63,7 +62,7 @@ class GfxDriver(Enum):
6362
NvidiaOpenKernel = 'Nvidia (open kernel module for newer GPUs, Turing+)'
6463
NvidiaOpenSource = 'Nvidia (open-source nouveau driver)'
6564
NvidiaProprietary = 'Nvidia (proprietary)'
66-
VMOpenSource = 'VMware / VirtualBox (open-source)'
65+
VMOpenSource = 'VirtualBox (open-source)'
6766

6867
def is_nvidia(self) -> bool:
6968
match self:
@@ -91,7 +90,6 @@ def gfx_packages(self) -> list[GfxPackage]:
9190
GfxPackage.Xf86VideoAmdgpu,
9291
GfxPackage.Xf86VideoAti,
9392
GfxPackage.Xf86VideoNouveau,
94-
GfxPackage.Xf86VideoVmware,
9593
GfxPackage.LibvaMesaDriver,
9694
GfxPackage.LibvaIntelDriver,
9795
GfxPackage.IntelMediaDriver,
@@ -136,7 +134,6 @@ def gfx_packages(self) -> list[GfxPackage]:
136134
case GfxDriver.VMOpenSource:
137135
packages += [
138136
GfxPackage.Mesa,
139-
GfxPackage.Xf86VideoVmware,
140137
]
141138

142139
return packages

schema.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"type": "object",
8484
"properties": {
8585
"type": "string",
86-
"nics": [
86+
"nics": {
8787
"type": "array",
8888
"items": {
8989
"iface": "string",
@@ -97,7 +97,7 @@
9797
"type": "string"
9898
}
9999
}
100-
]
100+
}
101101
}
102102
}
103103
},
@@ -175,7 +175,7 @@
175175
"description": "Graphics Drivers to install if a desktop profile is used, ignored otherwise.",
176176
"type": "string",
177177
"enum": [
178-
"VMware / VirtualBox (open-source)",
178+
"VirtualBox (open-source)",
179179
"Intel (open-source)",
180180
"AMD / ATI (open-source)",
181181
"All open-source (default)",
@@ -222,7 +222,7 @@
222222
]
223223
},
224224
{
225-
"required": [
225+
"required": {
226226
"!users": {
227227
"description": "User account",
228228
"type": "object",
@@ -232,7 +232,7 @@
232232
"sudo": "boolean"
233233
}
234234
}
235-
]
235+
}
236236
}
237237
]
238238
}

0 commit comments

Comments
 (0)