From c045ceec1ed6ae1f4ca4785d7e191f49b6be534a Mon Sep 17 00:00:00 2001 From: Neil Wilson Date: Mon, 9 Nov 2015 12:58:56 +0000 Subject: [PATCH] Change host restart to use the driver implementation Fixes #2140 Signed-off-by: Neil Wilson --- libmachine/host/host.go | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/libmachine/host/host.go b/libmachine/host/host.go index 7179819c77..b9cfb8fa6b 100644 --- a/libmachine/host/host.go +++ b/libmachine/host/host.go @@ -122,24 +122,15 @@ func (h *Host) Kill() error { } func (h *Host) Restart() error { + if drivers.MachineInState(h.Driver, state.Stopped)() { + return h.Start() + } if drivers.MachineInState(h.Driver, state.Running)() { - if err := h.Stop(); err != nil { - return err - } - - if err := mcnutils.WaitFor(drivers.MachineInState(h.Driver, state.Stopped)); err != nil { + if err := h.Driver.Restart(); err != nil { return err } + return mcnutils.WaitFor(drivers.MachineInState(h.Driver, state.Running)) } - - if err := h.Start(); err != nil { - return err - } - - if err := mcnutils.WaitFor(drivers.MachineInState(h.Driver, state.Running)); err != nil { - return err - } - return nil }