mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Add initial support for macOS Ventura
This commit is contained in:
		
							parent
							
								
									02e0a9e55a
								
							
						
					
					
						commit
						2071816ede
					
				
					 2 changed files with 24 additions and 9 deletions
				
			
		
							
								
								
									
										31
									
								
								quickemu
									
										
									
									
									
								
							
							
						
						
									
										31
									
								
								quickemu
									
										
									
									
									
								
							|  | @ -503,14 +503,27 @@ function vm_boot() { | ||||||
|     macos) |     macos) | ||||||
|       #https://www.nicksherlock.com/2020/06/installing-macos-big-sur-on-proxmox/ |       #https://www.nicksherlock.com/2020/06/installing-macos-big-sur-on-proxmox/ | ||||||
|       # A CPU with SSE4.1 support is required for >= macOS Sierra |       # A CPU with SSE4.1 support is required for >= macOS Sierra | ||||||
|       if check_cpu_flag sse4_1; then |       # A CPU with AVX2 support is required for >= macOS Ventura | ||||||
|           # Used in past versions: +movbe,+smep,+xgetbv1,+xsavec,+avx2 |       case ${macos_release} in | ||||||
|           # Warn on AMD:           +fma4,+pcid |         ventura) | ||||||
|           CPU="-cpu Penryn,kvm=on,vendor=GenuineIntel,+aes,+avx,+bmi1,+bmi2,+fma,+hypervisor,+invtsc,+kvm_pv_eoi,+kvm_pv_unhalt,+popcnt,+ssse3,+sse4.2,vmware-cpuid-freq=on,+xsave,+xsaveopt,check" |           if check_cpu_flag sse4_1 && check_cpu_flag avx2; then | ||||||
|       else |             CPU="-cpu Haswell,kvm=on,vendor=GenuineIntel,+hypervisor,+invtsc,+kvm_pv_eoi,+kvm_pv_unhalt" | ||||||
|         echo "ERROR! macOS requires a CPU with SSE 4.1 support." |           else | ||||||
|         exit 1 |             echo "ERROR! macOS ${macos_release} requires a CPU with SSE 4.1 and AVX2 support." | ||||||
|       fi |             exit 1 | ||||||
|  |           fi | ||||||
|  |           ;; | ||||||
|  |         *) | ||||||
|  |           if check_cpu_flag sse4_1; then | ||||||
|  |             # Used in past versions: +movbe,+smep,+xgetbv1,+xsavec,+avx2 | ||||||
|  |             # Warn on AMD:           +fma4,+pcid | ||||||
|  |             CPU="-cpu Penryn,kvm=on,vendor=GenuineIntel,+aes,+avx,+bmi1,+bmi2,+fma,+hypervisor,+invtsc,+kvm_pv_eoi,+kvm_pv_unhalt,+popcnt,+ssse3,+sse4.2,vmware-cpuid-freq=on,+xsave,+xsaveopt,check" | ||||||
|  |           else | ||||||
|  |             echo "ERROR! macOS ${macos_release} requires a CPU with SSE 4.1 support." | ||||||
|  |             exit 1 | ||||||
|  |           fi | ||||||
|  |           ;; | ||||||
|  |       esac | ||||||
| 
 | 
 | ||||||
|       OSK=$(echo "bheuneqjbexolgurfrjbeqfthneqrqcyrnfrqbagfgrny(p)NccyrPbzchgreVap" | tr 'A-Za-z' 'N-ZA-Mn-za-m') |       OSK=$(echo "bheuneqjbexolgurfrjbeqfthneqrqcyrnfrqbagfgrny(p)NccyrPbzchgreVap" | tr 'A-Za-z' 'N-ZA-Mn-za-m') | ||||||
|       # Disable S3 support in the VM to prevent macOS suspending during install |       # Disable S3 support in the VM to prevent macOS suspending during install | ||||||
|  | @ -529,7 +542,7 @@ function vm_boot() { | ||||||
|           NET_DEVICE="vmxnet3" |           NET_DEVICE="vmxnet3" | ||||||
|           USB_HOST_PASSTHROUGH_CONTROLLER="usb-ehci" |           USB_HOST_PASSTHROUGH_CONTROLLER="usb-ehci" | ||||||
|           ;; |           ;; | ||||||
|         big-sur|monterey) |         big-sur|monterey|ventura) | ||||||
|           BALLOON="-device virtio-balloon" |           BALLOON="-device virtio-balloon" | ||||||
|           MAC_DISK_DEV="virtio-blk-pci" |           MAC_DISK_DEV="virtio-blk-pci" | ||||||
|           NET_DEVICE="virtio-net" |           NET_DEVICE="virtio-net" | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								quickget
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								quickget
									
										
									
									
									
								
							|  | @ -1164,6 +1164,7 @@ function get_macos() { | ||||||
|     local CWD="" |     local CWD="" | ||||||
|     local MACRECOVERY="" |     local MACRECOVERY="" | ||||||
|     local MLB="" |     local MLB="" | ||||||
|  |     local OS_TYPE="default" | ||||||
| 
 | 
 | ||||||
|     case ${RELEASE} in |     case ${RELEASE} in | ||||||
|         high-sierra) |         high-sierra) | ||||||
|  | @ -1214,6 +1215,7 @@ function get_macos() { | ||||||
|         ${MACRECOVERY} \ |         ${MACRECOVERY} \ | ||||||
|             --board-id "${BOARD_ID}" \ |             --board-id "${BOARD_ID}" \ | ||||||
|             --mlb "${MLB}" \ |             --mlb "${MLB}" \ | ||||||
|  |             --os-type "${OS_TYPE}" \ | ||||||
|             --basename RecoveryImage \ |             --basename RecoveryImage \ | ||||||
|             --outdir "${VM_PATH}" \ |             --outdir "${VM_PATH}" \ | ||||||
|             download |             download | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue