mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Merge remote-tracking branch 'nqvrg/add-haiku'
into merging-updated-distros
This commit is contained in:
		
						commit
						2dcc05abac
					
				
					 3 changed files with 66 additions and 7 deletions
				
			
		
							
								
								
									
										17
									
								
								quickemu
									
										
									
									
									
								
							
							
						
						
									
										17
									
								
								quickemu
									
										
									
									
									
								
							|  | @ -228,7 +228,7 @@ function vm_boot() { | |||
|   local KERNEL_NODE="" | ||||
|   local KERNEL_VER="?" | ||||
|   local LSB_DESCRIPTION="Unknown OS" | ||||
|   local MACHINETYPE="q35" | ||||
|   local MACHINE_TYPE="q35" | ||||
|   local MAC_BOOTLOADER="" | ||||
|   local MAC_MISSING="" | ||||
|   local MAC_DISK_DEV="ide-hd,bus=ahci.2" | ||||
|  | @ -475,13 +475,24 @@ function vm_boot() { | |||
|       if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then | ||||
|         CPU="${CPU},topoext" | ||||
|       fi | ||||
|       MACHINETYPE="pc" | ||||
|       MACHINE_TYPE="pc" | ||||
|       NET_DEVICE="rtl8139" | ||||
|       GUEST_TWEAKS="-boot d" | ||||
|       if [ -z "${disk_size}" ]; then | ||||
|         disk_size="256M" | ||||
|       fi | ||||
|       ;; | ||||
|     haiku) | ||||
|       CPU="-cpu host,kvm=on" | ||||
|       MACHINE_TYPE="pc" | ||||
|       NET_DEVICE="rtl8139" | ||||
|       if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then | ||||
|         CPU="${CPU},topoext" | ||||
|       fi | ||||
|       if [ -z "${disk_size}" ]; then | ||||
|         disk_size="32G" | ||||
|       fi | ||||
|       ;; | ||||
|     macos) | ||||
|       #https://www.nicksherlock.com/2020/06/installing-macos-big-sur-on-proxmox/ | ||||
|       # A CPU with SSE4.1 support is required for >= macOS Sierra | ||||
|  | @ -852,7 +863,7 @@ function vm_boot() { | |||
| 
 | ||||
|   # shellcheck disable=SC2054,SC2206,SC2140 | ||||
|   args+=(-name ${VMNAME},process=${VMNAME} -pidfile "${VMDIR}/${VMNAME}.pid" | ||||
|          -enable-kvm -machine ${MACHINETYPE},smm=${SMM},vmport=off ${GUEST_TWEAKS} | ||||
|          -enable-kvm -machine ${MACHINE_TYPE},smm=${SMM},vmport=off ${GUEST_TWEAKS} | ||||
|          ${CPU} ${SMP} | ||||
|          -m ${RAM_VM} ${BALLOON} | ||||
|          -smbios type=2,manufacturer="Quickemu Project",product="Quickemu",version="${VERSION}",serial="0xDEADBEEF",location="quickemu.com",asset="${VMNAME}" | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue