Merge 2332e96f89 into 7f31e91099
				
					
				
			This commit is contained in:
		
						commit
						644dc9a718
					
				| 
						 | 
					@ -7,7 +7,7 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Title:            Docker-OSX (Mac on Docker)
 | 
					# Title:            Docker-OSX (Mac on Docker)
 | 
				
			||||||
# Author:           Sick.Codes https://twitter.com/sickcodes
 | 
					# Author:           Sick.Codes https://twitter.com/sickcodes
 | 
				
			||||||
# Version:          6.0
 | 
					# Version:          7.0
 | 
				
			||||||
# License:          GPLv3+
 | 
					# License:          GPLv3+
 | 
				
			||||||
# Repository:       https://github.com/sickcodes/Docker-OSX
 | 
					# Repository:       https://github.com/sickcodes/Docker-OSX
 | 
				
			||||||
# Website:          https://sick.codes
 | 
					# Website:          https://sick.codes
 | 
				
			||||||
| 
						 | 
					@ -195,8 +195,7 @@ RUN touch Launch.sh \
 | 
				
			||||||
    && tee -a Launch.sh <<< '-cpu ${CPU:-Penryn},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,}${BOOT_ARGS} \' \
 | 
					    && tee -a Launch.sh <<< '-cpu ${CPU:-Penryn},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,}${BOOT_ARGS} \' \
 | 
				
			||||||
    && tee -a Launch.sh <<< '-machine q35,${KVM-"accel=kvm:tcg"} \' \
 | 
					    && tee -a Launch.sh <<< '-machine q35,${KVM-"accel=kvm:tcg"} \' \
 | 
				
			||||||
    && tee -a Launch.sh <<< '-smp ${CPU_STRING:-${SMP:-4},cores=${CORES:-4}} \' \
 | 
					    && tee -a Launch.sh <<< '-smp ${CPU_STRING:-${SMP:-4},cores=${CORES:-4}} \' \
 | 
				
			||||||
    && tee -a Launch.sh <<< '-device qemu-xhci,id=xhci \' \
 | 
					    && tee -a Launch.sh <<< '${XHCI_STRING:--usb -device usb-kbd -device usb-tablet} \' \
 | 
				
			||||||
    && tee -a Launch.sh <<< '-device usb-kbd,bus=xhci.0 -device usb-tablet,bus=xhci.0 \' \
 | 
					 | 
				
			||||||
    && tee -a Launch.sh <<< '-device isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal\(c\)AppleComputerInc \' \
 | 
					    && tee -a Launch.sh <<< '-device isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal\(c\)AppleComputerInc \' \
 | 
				
			||||||
    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,readonly=on,file=/home/arch/OSX-KVM/OVMF_CODE.fd \' \
 | 
					    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,readonly=on,file=/home/arch/OSX-KVM/OVMF_CODE.fd \' \
 | 
				
			||||||
    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,file=/home/arch/OSX-KVM/OVMF_VARS-1024x768.fd \' \
 | 
					    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,file=/home/arch/OSX-KVM/OVMF_VARS-1024x768.fd \' \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue