diff --git a/drivers/virtualbox/virtualbox_freebsd.go b/drivers/virtualbox/virtualbox_freebsd.go new file mode 100644 index 0000000000..0631ed5123 --- /dev/null +++ b/drivers/virtualbox/virtualbox_freebsd.go @@ -0,0 +1,45 @@ +package virtualbox + +import ( + "bytes" + "io/ioutil" + + "github.com/docker/machine/libmachine/log" +) + +// IsVTXDisabled checks if VT-X is disabled in the BIOS. If it is, the vm will fail to start. +// If we can't be sure it is disabled, we carry on and will check the vm logs after it's started. +// We want to check that either vmx or svm flags are present in /proc/cpuinfo. +func (d *Driver) IsVTXDisabled() bool { + cpuinfo, err := ioutil.ReadFile("/proc/cpuinfo") + if err != nil { + log.Debugf("Couldn't check that VT-X/AMD-v is enabled. Will check that the vm is properly created: %v", err) + return false + } + return isVTXDisabled(cpuinfo) +} + +func isVTXDisabled(cpuinfo []byte) bool { + features := [2][]byte{ + {'v', 'm', 'x'}, + {'s', 'v', 'm'}, + } + for _, v := range features { + if bytes.Contains(cpuinfo, v) { + return false + } + } + return true +} + +func detectVBoxManageCmd() string { + return detectVBoxManageCmdInPath() +} + +func getShareDriveAndName() (string, string) { + return "hosthome", "/home" +} + +func isHyperVInstalled() bool { + return false +} diff --git a/libmachine/crashreport/os_freebsd.go b/libmachine/crashreport/os_freebsd.go new file mode 100644 index 0000000000..bea85cfc39 --- /dev/null +++ b/libmachine/crashreport/os_freebsd.go @@ -0,0 +1,12 @@ +package crashreport + +import "os/exec" + +func localOSVersion() string { + command := exec.Command("uname", "-r") + output, err := command.Output() + if err != nil { + return "" + } + return string(output) +} diff --git a/docs/DRIVER_SPEC.md b/machine/DRIVER_SPEC.md similarity index 100% rename from docs/DRIVER_SPEC.md rename to machine/DRIVER_SPEC.md diff --git a/docs/RELEASE.md b/machine/RELEASE.md similarity index 100% rename from docs/RELEASE.md rename to machine/RELEASE.md diff --git a/docs/completion.md b/machine/completion.md similarity index 100% rename from docs/completion.md rename to machine/completion.md diff --git a/docs/concepts.md b/machine/concepts.md similarity index 100% rename from docs/concepts.md rename to machine/concepts.md diff --git a/docs/drivers/aws.md b/machine/drivers/aws.md similarity index 100% rename from docs/drivers/aws.md rename to machine/drivers/aws.md diff --git a/docs/drivers/azure.md b/machine/drivers/azure.md similarity index 100% rename from docs/drivers/azure.md rename to machine/drivers/azure.md diff --git a/docs/drivers/digital-ocean.md b/machine/drivers/digital-ocean.md similarity index 100% rename from docs/drivers/digital-ocean.md rename to machine/drivers/digital-ocean.md diff --git a/docs/drivers/exoscale.md b/machine/drivers/exoscale.md similarity index 100% rename from docs/drivers/exoscale.md rename to machine/drivers/exoscale.md diff --git a/docs/drivers/gce.md b/machine/drivers/gce.md similarity index 100% rename from docs/drivers/gce.md rename to machine/drivers/gce.md diff --git a/docs/drivers/generic.md b/machine/drivers/generic.md similarity index 100% rename from docs/drivers/generic.md rename to machine/drivers/generic.md diff --git a/docs/drivers/hyper-v.md b/machine/drivers/hyper-v.md similarity index 100% rename from docs/drivers/hyper-v.md rename to machine/drivers/hyper-v.md diff --git a/docs/drivers/index.md b/machine/drivers/index.md similarity index 100% rename from docs/drivers/index.md rename to machine/drivers/index.md diff --git a/docs/drivers/openstack.md b/machine/drivers/openstack.md similarity index 100% rename from docs/drivers/openstack.md rename to machine/drivers/openstack.md diff --git a/docs/drivers/os-base.md b/machine/drivers/os-base.md similarity index 100% rename from docs/drivers/os-base.md rename to machine/drivers/os-base.md diff --git a/docs/drivers/rackspace.md b/machine/drivers/rackspace.md similarity index 100% rename from docs/drivers/rackspace.md rename to machine/drivers/rackspace.md diff --git a/docs/drivers/soft-layer.md b/machine/drivers/soft-layer.md similarity index 100% rename from docs/drivers/soft-layer.md rename to machine/drivers/soft-layer.md diff --git a/docs/drivers/virtualbox.md b/machine/drivers/virtualbox.md similarity index 100% rename from docs/drivers/virtualbox.md rename to machine/drivers/virtualbox.md diff --git a/docs/drivers/vm-cloud.md b/machine/drivers/vm-cloud.md similarity index 100% rename from docs/drivers/vm-cloud.md rename to machine/drivers/vm-cloud.md diff --git a/docs/drivers/vm-fusion.md b/machine/drivers/vm-fusion.md similarity index 100% rename from docs/drivers/vm-fusion.md rename to machine/drivers/vm-fusion.md diff --git a/docs/drivers/vsphere.md b/machine/drivers/vsphere.md similarity index 100% rename from docs/drivers/vsphere.md rename to machine/drivers/vsphere.md diff --git a/docs/examples/aws.md b/machine/examples/aws.md similarity index 100% rename from docs/examples/aws.md rename to machine/examples/aws.md diff --git a/docs/examples/index.md b/machine/examples/index.md similarity index 100% rename from docs/examples/index.md rename to machine/examples/index.md diff --git a/docs/examples/ocean.md b/machine/examples/ocean.md similarity index 100% rename from docs/examples/ocean.md rename to machine/examples/ocean.md diff --git a/docs/get-started-cloud.md b/machine/get-started-cloud.md similarity index 100% rename from docs/get-started-cloud.md rename to machine/get-started-cloud.md diff --git a/docs/get-started.md b/machine/get-started.md similarity index 100% rename from docs/get-started.md rename to machine/get-started.md diff --git a/docs/img/aws-instance-east.png b/machine/img/aws-instance-east.png similarity index 100% rename from docs/img/aws-instance-east.png rename to machine/img/aws-instance-east.png diff --git a/docs/img/aws-instance-west.png b/machine/img/aws-instance-west.png similarity index 100% rename from docs/img/aws-instance-west.png rename to machine/img/aws-instance-west.png diff --git a/docs/img/coverage.png b/machine/img/coverage.png similarity index 100% rename from docs/img/coverage.png rename to machine/img/coverage.png diff --git a/docs/img/docker-engine.png b/machine/img/docker-engine.png similarity index 100% rename from docs/img/docker-engine.png rename to machine/img/docker-engine.png diff --git a/docs/img/engine.png b/machine/img/engine.png similarity index 100% rename from docs/img/engine.png rename to machine/img/engine.png diff --git a/docs/img/hyperv-manager.png b/machine/img/hyperv-manager.png similarity index 100% rename from docs/img/hyperv-manager.png rename to machine/img/hyperv-manager.png diff --git a/docs/img/hyperv-network-switch.png b/machine/img/hyperv-network-switch.png similarity index 100% rename from docs/img/hyperv-network-switch.png rename to machine/img/hyperv-network-switch.png diff --git a/docs/img/linux_docker_host.svg b/machine/img/linux_docker_host.svg similarity index 100% rename from docs/img/linux_docker_host.svg rename to machine/img/linux_docker_host.svg diff --git a/docs/img/logo.png b/machine/img/logo.png similarity index 100% rename from docs/img/logo.png rename to machine/img/logo.png diff --git a/docs/img/mac_docker_host.svg b/machine/img/mac_docker_host.svg similarity index 100% rename from docs/img/mac_docker_host.svg rename to machine/img/mac_docker_host.svg diff --git a/docs/img/machine-mac-win.png b/machine/img/machine-mac-win.png similarity index 100% rename from docs/img/machine-mac-win.png rename to machine/img/machine-mac-win.png diff --git a/docs/img/machine.png b/machine/img/machine.png similarity index 100% rename from docs/img/machine.png rename to machine/img/machine.png diff --git a/docs/img/nginx-webserver.png b/machine/img/nginx-webserver.png similarity index 100% rename from docs/img/nginx-webserver.png rename to machine/img/nginx-webserver.png diff --git a/docs/img/ocean_click_api.png b/machine/img/ocean_click_api.png similarity index 100% rename from docs/img/ocean_click_api.png rename to machine/img/ocean_click_api.png diff --git a/docs/img/ocean_droplet.png b/machine/img/ocean_droplet.png similarity index 100% rename from docs/img/ocean_droplet.png rename to machine/img/ocean_droplet.png diff --git a/docs/img/ocean_gen_token.png b/machine/img/ocean_gen_token.png similarity index 100% rename from docs/img/ocean_gen_token.png rename to machine/img/ocean_gen_token.png diff --git a/docs/img/ocean_save_token.png b/machine/img/ocean_save_token.png similarity index 100% rename from docs/img/ocean_save_token.png rename to machine/img/ocean_save_token.png diff --git a/docs/img/ocean_token_create.png b/machine/img/ocean_token_create.png similarity index 100% rename from docs/img/ocean_token_create.png rename to machine/img/ocean_token_create.png diff --git a/docs/img/provision-use-case.png b/machine/img/provision-use-case.png similarity index 100% rename from docs/img/provision-use-case.png rename to machine/img/provision-use-case.png diff --git a/docs/index.md b/machine/index.md similarity index 100% rename from docs/index.md rename to machine/index.md diff --git a/docs/install-machine.md b/machine/install-machine.md similarity index 100% rename from docs/install-machine.md rename to machine/install-machine.md diff --git a/docs/migrate-to-machine.md b/machine/migrate-to-machine.md similarity index 100% rename from docs/migrate-to-machine.md rename to machine/migrate-to-machine.md diff --git a/docs/overview.md b/machine/overview.md similarity index 100% rename from docs/overview.md rename to machine/overview.md diff --git a/docs/reference/active.md b/machine/reference/active.md similarity index 100% rename from docs/reference/active.md rename to machine/reference/active.md diff --git a/docs/reference/config.md b/machine/reference/config.md similarity index 100% rename from docs/reference/config.md rename to machine/reference/config.md diff --git a/docs/reference/create.md b/machine/reference/create.md similarity index 100% rename from docs/reference/create.md rename to machine/reference/create.md diff --git a/docs/reference/env.md b/machine/reference/env.md similarity index 100% rename from docs/reference/env.md rename to machine/reference/env.md diff --git a/docs/reference/help.md b/machine/reference/help.md similarity index 100% rename from docs/reference/help.md rename to machine/reference/help.md diff --git a/docs/reference/index.md b/machine/reference/index.md similarity index 100% rename from docs/reference/index.md rename to machine/reference/index.md diff --git a/docs/reference/inspect.md b/machine/reference/inspect.md similarity index 100% rename from docs/reference/inspect.md rename to machine/reference/inspect.md diff --git a/docs/reference/ip.md b/machine/reference/ip.md similarity index 100% rename from docs/reference/ip.md rename to machine/reference/ip.md diff --git a/docs/reference/kill.md b/machine/reference/kill.md similarity index 100% rename from docs/reference/kill.md rename to machine/reference/kill.md diff --git a/docs/reference/ls.md b/machine/reference/ls.md similarity index 100% rename from docs/reference/ls.md rename to machine/reference/ls.md diff --git a/docs/reference/provision.md b/machine/reference/provision.md similarity index 100% rename from docs/reference/provision.md rename to machine/reference/provision.md diff --git a/docs/reference/regenerate-certs.md b/machine/reference/regenerate-certs.md similarity index 100% rename from docs/reference/regenerate-certs.md rename to machine/reference/regenerate-certs.md diff --git a/docs/reference/restart.md b/machine/reference/restart.md similarity index 100% rename from docs/reference/restart.md rename to machine/reference/restart.md diff --git a/docs/reference/rm.md b/machine/reference/rm.md similarity index 100% rename from docs/reference/rm.md rename to machine/reference/rm.md diff --git a/docs/reference/scp.md b/machine/reference/scp.md similarity index 100% rename from docs/reference/scp.md rename to machine/reference/scp.md diff --git a/docs/reference/ssh.md b/machine/reference/ssh.md similarity index 100% rename from docs/reference/ssh.md rename to machine/reference/ssh.md diff --git a/docs/reference/start.md b/machine/reference/start.md similarity index 100% rename from docs/reference/start.md rename to machine/reference/start.md diff --git a/docs/reference/status.md b/machine/reference/status.md similarity index 100% rename from docs/reference/status.md rename to machine/reference/status.md diff --git a/docs/reference/stop.md b/machine/reference/stop.md similarity index 100% rename from docs/reference/stop.md rename to machine/reference/stop.md diff --git a/docs/reference/upgrade.md b/machine/reference/upgrade.md similarity index 100% rename from docs/reference/upgrade.md rename to machine/reference/upgrade.md diff --git a/docs/reference/url.md b/machine/reference/url.md similarity index 100% rename from docs/reference/url.md rename to machine/reference/url.md