From 63e3235d91131602e5f9259910b9dcecbb7f1126 Mon Sep 17 00:00:00 2001 From: Nikolay Edigaryev Date: Tue, 2 Jul 2024 16:39:51 +0400 Subject: [PATCH] tart run: pick up --net-softnet-allow when using --net-host (#853) --- Sources/tart/Commands/Run.swift | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Sources/tart/Commands/Run.swift b/Sources/tart/Commands/Run.swift index 81686af..f37c76d 100644 --- a/Sources/tart/Commands/Run.swift +++ b/Sources/tart/Commands/Run.swift @@ -396,21 +396,22 @@ struct Run: AsyncParsableCommand { } func userSpecifiedNetwork(vmDir: VMDirectory) throws -> Network? { + var softnetExtraArguments: [String] = [] + + if let netSoftnetAllow = netSoftnetAllow { + softnetExtraArguments += ["--allow", netSoftnetAllow] + } + if netSoftnet { let config = try VMConfig.init(fromURL: vmDir.configURL) - var extraArguments: [String] = [] - - if let netSoftnetAllow = netSoftnetAllow { - extraArguments += ["--allow", netSoftnetAllow] - } - - return try Softnet(vmMACAddress: config.macAddress.string, extraArguments: extraArguments) + return try Softnet(vmMACAddress: config.macAddress.string, extraArguments: softnetExtraArguments) } if netHost { let config = try VMConfig.init(fromURL: vmDir.configURL) - return try Softnet(vmMACAddress: config.macAddress.string, extraArguments: ["--vm-net-type", "host"]) + + return try Softnet(vmMACAddress: config.macAddress.string, extraArguments: ["--vm-net-type", "host"] + softnetExtraArguments) } if netBridged.count > 0 {