From 2d525d0abd21e6078ba4b873e2072d38c620cfed Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Thu, 30 Apr 2015 17:05:59 -0400 Subject: [PATCH] generic: update to new logging; fix ssh user bug Signed-off-by: Evan Hazlett --- drivers/generic/generic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/generic/generic.go b/drivers/generic/generic.go index 4b70c6f5f9..33c38bdbf8 100644 --- a/drivers/generic/generic.go +++ b/drivers/generic/generic.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - log "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" "github.com/docker/machine/drivers" + "github.com/docker/machine/log" "github.com/docker/machine/provider" "github.com/docker/machine/state" "github.com/docker/machine/utils" @@ -113,7 +113,7 @@ func (d *Driver) GetProviderType() provider.ProviderType { func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { d.IPAddress = flags.String("generic-ip-address") - d.SSHUser = flags.String("generic-user") + d.SSHUser = flags.String("generic-ssh-user") d.SSHKey = flags.String("generic-ssh-key") d.SSHPort = flags.Int("generic-ssh-port")