From 5c0f3b829b48e48f1c3c9da30b0fc4af438860a7 Mon Sep 17 00:00:00 2001
From: Richard Gooch <rg+github0@safe-mbox.com>
Date: Sat, 22 Dec 2018 07:33:01 -0800
Subject: [PATCH] Fix panic in vm-control change-vm-tags when VM has no
 existing tags.

---
 cmd/vm-control/changeVmTags.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmd/vm-control/changeVmTags.go b/cmd/vm-control/changeVmTags.go
index 1eeb898a..ae76ffcf 100644
--- a/cmd/vm-control/changeVmTags.go
+++ b/cmd/vm-control/changeVmTags.go
@@ -50,6 +50,9 @@ func changeVmTagsOnHypervisor(hypervisor string, ipAddr net.IP,
 	if err := errors.New(reply.Error); err != nil {
 		return err
 	}
+	if len(reply.VmInfo.Tags) < 1 {
+		return setVmTagsOnHypervisor(client, ipAddr, vmTags, logger)
+	}
 	reply.VmInfo.Tags.Merge(vmTags)
 	for key, value := range reply.VmInfo.Tags {
 		if value == "" {