github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Added Linux $PATH support and fixed FlagSet typo

Browse Source 
Signed-off-by: Dan Finneran <daniel.finneran@gmail.com>
This commit is contained in:
thebsdbox 2017-04-11 11:48:51 +01:00
parent eae5422a0d
commit b6e8d4fd63
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmd/moby/run_vmware.go
View File

@ -58,7 +58,7 @@ guestOS = "other3xlinux-64"
` `
func runVMware(args []string) { func runVMware(args []string) {
vmwareArgs := flag.NewFlagSet("hyperkit", flag.ExitOnError) vmwareArgs := flag.NewFlagSet("vmware", flag.ExitOnError)
vmwareArgs.Usage = func() { vmwareArgs.Usage = func() {
fmt.Printf("USAGE: %s run vmware [options] prefix\n\n", os.Args[0]) fmt.Printf("USAGE: %s run vmware [options] prefix\n\n", os.Args[0])
fmt.Printf("'prefix' specifies the path to the VM image.\n") fmt.Printf("'prefix' specifies the path to the VM image.\n")
@ -102,6 +102,16 @@ func runVMware(args []string) {
vmrunArgs = []string{"-T", "fusion", "start", prefix + ".vmx"} vmrunArgs = []string{"-T", "fusion", "start", prefix + ".vmx"}
} }
if runtime.GOOS == "linux" {
path = "vmrun"
fullVMrunPath, err := exec.LookPath(path)
if err != nil {
log.Fatalf("Unable to find %s within the $PATH", path)
}
path = fullVMrunPath
vmrunArgs = []string{"-T", "ws", "start", prefix + ".vmx"}
}
// Check executables exist before attempting to execute // Check executables exist before attempting to execute
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
log.Fatalf("ERROR VMware exectuables can not be found, ensure software is installed") log.Fatalf("ERROR VMware exectuables can not be found, ensure software is installed")