diff --git a/CREDITS.md b/CREDITS.md index 8522c3f..4e776ab 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -25,3 +25,5 @@ * Nicholas Sherlock - UEFI, Clover, and other hacks * Phil Dennis-Jordan - virtio-net-osx, usb-tablet and other hacks + +* Nikolay Dimitrov (nikidim) - Docker for Mac diff --git a/Clover.qcow2 b/Clover.qcow2 index 438718f..daf7c04 100644 Binary files a/Clover.qcow2 and b/Clover.qcow2 differ diff --git a/HighSierra/Clover-v2.4k-4233-X64.iso b/HighSierra/Clover-v2.4k-4330-X64.iso similarity index 78% rename from HighSierra/Clover-v2.4k-4233-X64.iso rename to HighSierra/Clover-v2.4k-4330-X64.iso index 0d8a574..28e2c56 100644 Binary files a/HighSierra/Clover-v2.4k-4233-X64.iso and b/HighSierra/Clover-v2.4k-4330-X64.iso differ diff --git a/README.md b/README.md index 16a47a6..fac2ac8 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,10 @@ Intel VT-x / AMD SVM is required. To install OS X, you can use the included `boot-macOS.sh` script for a more solid alternate to the following `virsh` method. Use either the `boot-macOS.sh` -method or the following `virsh` method to install OS X / macOS. +method or the following `virsh / virt-manager` method to install OS X / macOS. + +Update: The `virt-manager` method is no longer recommended, and no support is +provided for it. * Edit `macOS-libvirt.xml` file and change file paths for `mac_hdd.qcow2` (HDD), `Install_OS_X_10.11_El_Capitan.iso` (bootable ISO image) and `enoch_rev2839_boot` suitably. diff --git a/UEFI/README.md b/UEFI/README.md index 5602aee..55c781b 100644 --- a/UEFI/README.md +++ b/UEFI/README.md @@ -1,7 +1,6 @@ ### Setting up UEFI enabled macOS -**This is under development. No support is provided for OVMF and Clover based -installations at the moment. Experiment at your own risk.** +**This is under development. Experiment at your own risk.** * Install macOS by following the usual Enoch method. diff --git a/boot-macOS-HS.sh b/boot-macOS-HS.sh index 1463f6f..f77d45c 100755 --- a/boot-macOS-HS.sh +++ b/boot-macOS-HS.sh @@ -27,6 +27,6 @@ MY_OPTIONS="+aes,+xsave,+avx,+xsaveopt,avx2,+smep" -device ide-drive,bus=ide.1,drive=MacHDD \ -drive id=MacHDD,if=none,file=./mac_hdd.img,format=qcow2 \ -device ide-drive,bus=ide.0,drive=MacDVD \ - -drive id=MacDVD,if=none,snapshot=on,media=cdrom,file=./'HighSierra.iso' \ + -drive id=MacDVD,if=none,snapshot=on,media=cdrom,file=./'HighSierra-10.13.2.iso' \ -netdev tap,id=net0,ifname=tap0,script=no,downscript=no -device e1000-82545em,netdev=net0,id=net0,mac=52:54:00:c9:18:27 \ -monitor stdio diff --git a/notes.md b/notes.md index 606fcca..1f43199 100644 --- a/notes.md +++ b/notes.md @@ -243,6 +243,18 @@ machdep.cpu.leaf7_features: SMEP BMI1 AVX2 BMI2 machdep.cpu.leaf7_feature_bits: 424 ``` +### Running Docker for Mac + +Docker for Mac requires enabling nested virtualization on your host machine, + +``` +modprobe -r kvm_intel +modprobe kvm_intel nested=1 +``` + +Also you have to add `vmx,rdtscp` arguments to the `-cpu` option in +`boot-macOS.sh` file. + ### Using virtio-net-osx with macOS Configuration options for macOS Sierra (thanks to virtio-net-osx project users),