vm(apple): support booting into recoveryOS on Ventura

Resolves #3526
utmapp · Aug 3, 2022 · cb4b8a9 · cb4b8a9
1 parent 683125c
commit cb4b8a9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/Configuration/UTMAppleConfigurationBoot.swift b/Configuration/UTMAppleConfigurationBoot.swift
@@ -39,6 +39,9 @@ struct UTMAppleConfigurationBoot: Codable {
     var linuxCommandLine: String?
     var linuxInitialRamdiskURL: URL?
 
+    /// Next startup should be in recovery. Not saved.
+    var startUpFromMacOSRecovery: Bool = false
+
     private enum CodingKeys: String, CodingKey {
         case operatingSystem = "OperatingSystem"
         case linuxKernelPath = "LinuxKernelPath"

diff --git a/Managers/UTMAppleVirtualMachine.swift b/Managers/UTMAppleVirtualMachine.swift
@@ -84,8 +84,23 @@ import Virtualization
 
     private func _vmStart() async throws {
         try createAppleVM()
-        try await withCheckedThrowingContinuation { continuation in
+        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) -> Void in
             vmQueue.async {
+                #if os(macOS) && arch(arm64)
+                let boot = self.appleConfig.system.boot
+                if #available(macOS 13, *), boot.operatingSystem == .macOS {
+                    let options = VZMacOSVirtualMachineStartOptions()
+                    options.startUpFromMacOSRecovery = boot.startUpFromMacOSRecovery
+                    self.apple.start(options: options) { result in
+                        if let result = result {
+                            continuation.resume(with: .failure(result))
+                        } else {
+                            continuation.resume()
+                        }
+                    }
+                    return
+                }
+                #endif
                 self.apple.start { result in
                     continuation.resume(with: result)
                 }

diff --git a/Platform/Shared/VMContextMenuModifier.swift b/Platform/Shared/VMContextMenuModifier.swift
@@ -55,6 +55,17 @@ struct VMContextMenuModifier: ViewModifier {
                     Label("Run", systemImage: "play.fill")
                 }.help("Run the VM in the foreground.")
 
+                #if os(macOS) && arch(arm64)
+                if #available(macOS 13, *), let appleConfig = vm.config.appleConfig, appleConfig.system.boot.operatingSystem == .macOS {
+                    Button {
+                        appleConfig.system.boot.startUpFromMacOSRecovery = true
+                        data.run(vm: vm)
+                    } label: {
+                        Label("Run Recovery", systemImage: "play.fill")
+                    }.help("Boot into recovery mode.")
+                }
+                #endif
+
                 Button {
                     vm.isRunningAsSnapshot = true
                     data.run(vm: vm)