Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Extract vmNotRunningError #343

Merged
gmlewis merged 1 commit into from
Feb 23, 2015
Merged

Extract vmNotRunningError #343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions cmds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ import (
_ "github.com/boot2docker/boot2docker-cli/virtualbox"
)

func vmNotRunningError(vmName string) error {
return fmt.Errorf("VM %q is not running. (Did you run `boot2docker up`?)", vmName)
}

// Initialize the boot2docker VM from scratch.
func cmdInit() error {
B2D.Init = false
Expand Down Expand Up @@ -165,7 +169,7 @@ func cmdShellInit() error {
}

if m.GetState() != driver.Running {
return fmt.Errorf("VM %q is not running.", B2D.VM)
return vmNotRunningError(B2D.VM)
}

socket, err := RequestSocketFromSSH(m)
Expand Down Expand Up @@ -506,7 +510,7 @@ func cmdSSH() error {
}

if m.GetState() != driver.Running {
return fmt.Errorf("VM %q is not running.", B2D.VM)
return vmNotRunningError(B2D.VM)
}

// find the ssh cmd string and then pass any remaining strings to ssh
Expand All @@ -530,7 +534,7 @@ func cmdIP() error {
}

if m.GetState() != driver.Running {
return fmt.Errorf("VM %q is not running.", B2D.VM)
return vmNotRunningError(B2D.VM)
}

IP := ""
Expand Down