Merge pull request #3 from cblackcom/pr/mac-address-argument

MAC address argument
azenla · Nov 28, 2020 · 737516e · 737516e
2 parents 811ab8e + e9218df
commit 737516e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# Mac junk
+.DS_Store
+
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

diff --git a/virtual/VirtualCommandRun.swift b/virtual/VirtualCommandRun.swift
@@ -36,6 +36,10 @@ struct VirtualCommandRun: ParsableCommand {
   @Flag(name: .shortAndLong, help: "Enable NAT Networking")
   var network: Bool = false
 
+  // if not specified, will generate at random
+  @Option(name: [.customShort("a"), .long], help: "MAC Address")
+  var macaddr: String = ""
+
   @Flag(name: .long, help: "Show Version Information")
   var version: Bool = false
 

diff --git a/virtual/VirtualSystem.swift b/virtual/VirtualSystem.swift
@@ -40,7 +40,7 @@ class VirtualSystem: NSObject, VZVirtualMachineDelegate {
     var storage: [VZStorageDeviceConfiguration] = []
     if !command.disk.isEmpty {
       for disk in command.disk {
-        let blockAttachment = try VZDiskImageStorageDeviceAttachment(url: URL(fileURLWithPath: disk).absoluteURL, readOnly: true)
+        let blockAttachment = try VZDiskImageStorageDeviceAttachment(url: URL(fileURLWithPath: disk).absoluteURL, readOnly: false)
         let blockDevice = VZVirtioBlockDeviceConfiguration(attachment: blockAttachment)
         storage.append(blockDevice)
       }
@@ -50,6 +50,13 @@ class VirtualSystem: NSObject, VZVirtualMachineDelegate {
 
     if command.network {
       let networkDevice = VZVirtioNetworkDeviceConfiguration()
+      if !command.macaddr.isEmpty {
+        if let macAddress = VZMACAddress(string: command.macaddr) {
+            networkDevice.macAddress = macAddress
+        } else {
+            NSLog("Ignoring MAC Address: was not in acceptable format e.g. 01:23:45:ab:cd:ef")
+        }
+      }
       networkDevice.attachment = VZNATNetworkDeviceAttachment()
       network.append(networkDevice)
     }