mirror of
				https://github.com/oSoWoSo/DistroHopper.git
				synced 2024-08-14 22:46:53 +00:00 
			
		
		
		
	Tidy up the KolibriOS support
This commit is contained in:
		
							parent
							
								
									9443931dbb
								
							
						
					
					
						commit
						2d271e3176
					
				
					 1 changed files with 7 additions and 12 deletions
				
			
		
							
								
								
									
										19
									
								
								quickemu
									
										
									
									
									
								
							
							
						
						
									
										19
									
								
								quickemu
									
										
									
									
									
								
							|  | @ -488,9 +488,6 @@ function vm_boot() { | ||||||
|       fi |       fi | ||||||
|       MACHINE_TYPE="pc" |       MACHINE_TYPE="pc" | ||||||
|       NET_DEVICE="rtl8139" |       NET_DEVICE="rtl8139" | ||||||
|       if [ -z "${disk_size}" ]; then |  | ||||||
|         disk_size="256M" |  | ||||||
|       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/ | ||||||
|  | @ -927,13 +924,6 @@ function vm_boot() { | ||||||
|     args+=(-drive if=floppy,format=raw,file="${floppy}") |     args+=(-drive if=floppy,format=raw,file="${floppy}") | ||||||
|   fi |   fi | ||||||
| 
 | 
 | ||||||
|   # Since there is bug (probably) in KolibriOS: cdrom indexes 0 or 1 make system show an extra unexisting iso, so we use index=2 |  | ||||||
|   if [ -n "${iso}" ] && [ "${guest_os}" == "kolibrios" ]; then |  | ||||||
|     # shellcheck disable=SC2054 |  | ||||||
|     args+=(-drive media=cdrom,index=2,file="${iso}") |  | ||||||
|     iso="" |  | ||||||
|   fi |  | ||||||
| 
 |  | ||||||
|   if [ -n "${iso}" ]; then |   if [ -n "${iso}" ]; then | ||||||
|     # shellcheck disable=SC2054 |     # shellcheck disable=SC2054 | ||||||
|     args+=(-drive media=cdrom,index=0,file="${iso}") |     args+=(-drive media=cdrom,index=0,file="${iso}") | ||||||
|  | @ -944,8 +934,13 @@ function vm_boot() { | ||||||
|     args+=(-drive media=cdrom,index=1,file="${fixed_iso}") |     args+=(-drive media=cdrom,index=1,file="${fixed_iso}") | ||||||
|   fi |   fi | ||||||
| 
 | 
 | ||||||
|   # Attach the unattended configuration to Windows guests when booting from ISO |   if [ -n "${iso}" ] && [ "${guest_os}" == "kolibrios" ]; then | ||||||
|   if [ -n "${iso}" ] && [ "${guest_os}" == "windows" ] && [ -e "${VMDIR}/unattended.iso" ]; then |     # Since there is bug (probably) in KolibriOS: cdrom indexes 0 or 1 make system show an extra unexisting iso, so we use index=2 | ||||||
|  |     # shellcheck disable=SC2054 | ||||||
|  |     args+=(-drive media=cdrom,index=2,file="${iso}") | ||||||
|  |     iso="" | ||||||
|  |   elif [ -n "${iso}" ] && [ "${guest_os}" == "windows" ] && [ -e "${VMDIR}/unattended.iso" ]; then | ||||||
|  |     # Attach the unattended configuration to Windows guests when booting from ISO | ||||||
|     # shellcheck disable=SC2054 |     # shellcheck disable=SC2054 | ||||||
|     args+=(-drive media=cdrom,index=2,file="${VMDIR}/unattended.iso") |     args+=(-drive media=cdrom,index=2,file="${VMDIR}/unattended.iso") | ||||||
|   fi |   fi | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue