Replace toolbox with open-vm-tools

installer/Makefile

@@ -36,25 +36,23 @@ ovfenv := $(BIN)/ovfenv
 vic-ova-ui := $(BIN)/vic-ova-ui
 ova-webserver := $(BIN)/ova-webserver
 ova-landing-server := $(BIN)/ova-landing-server
-toolbox := $(BIN)/toolbox
 rpctool := $(BIN)/rpctool
 gas: $(GAS)
 ovfenv: $(ovfenv)
 vic-ova-ui: $(vic-ova-ui)
 ova-webserver: $(ova-webserver)
 ova-landing-server: $(ova-landing-server)
-toolbox: $(toolbox)
 rpctool: $(rpctool)
 tools: $(DEP) $(GOLINT) $(GAS)
-all: golint gofmt govet gas $(ovfenv) $(vic-ova-ui) $(ova-webserver) $(ova-landing-server) $(toolbox) $(rpctool)
+all: golint gofmt govet gas $(ovfenv) $(vic-ova-ui) $(ova-webserver) $(ova-landing-server) $(rpctool)
 
 vendor: $(DEP)
  @echo restoring vendor
  $(DEP) ensure
 
 gas: $(GAS)
  @echo running go AST tool
- @$(GAS) -quiet fileserver/... landing_server/... lib/... ovatools/... pkg/... toolbox/... 2> /dev/null
+ @$(GAS) -quiet fileserver/... landing_server/... lib/... ovatools/... pkg/... 2> /dev/null
 
 golint: $(GOLINT)
  @echo checking go lint...
@@ -63,7 +61,6 @@ golint: $(GOLINT)
  @$(call golintf,github.com/vmware/vic-product/installer/lib/...)
  @$(call golintf,github.com/vmware/vic-product/installer/ovatools/...)
  @$(call golintf,github.com/vmware/vic-product/installer/pkg/...)
- @$(call golintf,github.com/vmware/vic-product/installer/toolbox/...)
 
 gofmt:
  @echo checking gofmt...
@@ -111,10 +108,6 @@ $(ova-landing-server): $(call godeps,landing_server/*.go)
  @echo building ova-landing-server
  @GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
 
-$(toolbox): $(call godeps,toolbox/*.go)
- @echo building toolbox
- @GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
 $(rpctool): $(call godeps,ovatools/rpctool/*.go)
  @echo building rpctool
  @GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)

installer/build/bootable/build-base.sh

@@ -77,7 +77,8 @@ function set_base() {
  cdrkit xfsprogs sudo \
  lvm2 parted gptfdisk \
  e2fsprogs docker-17.12.1-1.ph1 gzip \
- net-tools logrotate sshpass
+ net-tools logrotate sshpass \
+ open-vm-tools
 
  log3 "installing package dependencies"
  tdnf install --installroot "${rt}/" --refresh -y \

installer/build/ova-manifest.json

@@ -31,11 +31,6 @@
  "source": "../bin/ova-landing-server",
  "destination": "/usr/local/bin/ova-landing-server"
  },
- {
- "type": "file",
- "source": "../bin/toolbox",
- "destination": "/usr/bin/toolbox"
- },
  {
  "type": "file",
  "source": "../bin/rpctool",