mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Consolidate BSD, Haiku and Linux guests
This commit is contained in:
		
							parent
							
								
									8f41c4c90f
								
							
						
					
					
						commit
						5bfec8a9d3
					
				
					 2 changed files with 10 additions and 20 deletions
				
			
		
							
								
								
									
										19
									
								
								quickemu
									
										
									
									
									
								
							
							
						
						
									
										19
									
								
								quickemu
									
										
									
									
									
								
							|  | @ -464,14 +464,19 @@ function vm_boot() { | ||||||
| 
 | 
 | ||||||
|   # Make any OS specific adjustments |   # Make any OS specific adjustments | ||||||
|   case ${guest_os} in |   case ${guest_os} in | ||||||
|     freebsd|linux|openbsd) |     *bsd|haiku|linux) | ||||||
|       CPU="-cpu host,kvm=on" |       CPU="-cpu host,kvm=on" | ||||||
|       if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then |       if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then | ||||||
|         CPU="${CPU},topoext" |         CPU="${CPU},topoext" | ||||||
|       fi |       fi | ||||||
|  | 
 | ||||||
|       if [ "${guest_os}" == "freebsd" ]; then |       if [ "${guest_os}" == "freebsd" ]; then | ||||||
|         MOUSE="usb-mouse" |         MOUSE="usb-mouse" | ||||||
|  |       elif [ "${guest_os}" == "haiku" ]; then | ||||||
|  |         MACHINE_TYPE="pc" | ||||||
|  |         NET_DEVICE="rtl8139" | ||||||
|       fi |       fi | ||||||
|  | 
 | ||||||
|       if [ -z "${disk_size}" ]; then |       if [ -z "${disk_size}" ]; then | ||||||
|         disk_size="16G" |         disk_size="16G" | ||||||
|       fi |       fi | ||||||
|  | @ -483,22 +488,10 @@ function vm_boot() { | ||||||
|       fi |       fi | ||||||
|       MACHINE_TYPE="pc" |       MACHINE_TYPE="pc" | ||||||
|       NET_DEVICE="rtl8139" |       NET_DEVICE="rtl8139" | ||||||
|       GUEST_TWEAKS="-boot d" |  | ||||||
|       if [ -z "${disk_size}" ]; then |       if [ -z "${disk_size}" ]; then | ||||||
|         disk_size="256M" |         disk_size="256M" | ||||||
|       fi |       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) |     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 | ||||||
|  |  | ||||||
							
								
								
									
										11
									
								
								quickget
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								quickget
									
										
									
									
									
								
							|  | @ -588,8 +588,8 @@ function make_vm_config() { | ||||||
|     IMAGE_FILE="${1}" |     IMAGE_FILE="${1}" | ||||||
|     ISO_FILE="${2}" |     ISO_FILE="${2}" | ||||||
|     case "${OS}" in |     case "${OS}" in | ||||||
|         freebsd ) |         freebsd|openbsd) | ||||||
|             GUEST="freebsd" |             GUEST="bsd" | ||||||
|             IMAGE_TYPE="iso";; |             IMAGE_TYPE="iso";; | ||||||
|         haiku) |         haiku) | ||||||
|             GUEST="haiku" |             GUEST="haiku" | ||||||
|  | @ -597,13 +597,10 @@ function make_vm_config() { | ||||||
|         kolibrios) |         kolibrios) | ||||||
|             GUEST="kolibrios" |             GUEST="kolibrios" | ||||||
|             IMAGE_TYPE="iso";; |             IMAGE_TYPE="iso";; | ||||||
|         openbsd ) |         macos) | ||||||
|             GUEST="openbsd" |  | ||||||
|             IMAGE_TYPE="iso";; |  | ||||||
|         macos ) |  | ||||||
|             GUEST="macos" |             GUEST="macos" | ||||||
|             IMAGE_TYPE="img";; |             IMAGE_TYPE="img";; | ||||||
|         windows ) |         windows) | ||||||
|             GUEST="windows" |             GUEST="windows" | ||||||
|             IMAGE_TYPE="iso";; |             IMAGE_TYPE="iso";; | ||||||
|         *) |         *) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue