diff --git a/components/engine/commands.go b/components/engine/commands.go index d23c7a9da5..b93f0b9686 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -471,7 +471,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error { fmt.Fprintf(cli.out, "Debug mode (client): %v\n", os.Getenv("DEBUG") != "") fmt.Fprintf(cli.out, "Fds: %d\n", remoteInfo.GetInt("NFd")) fmt.Fprintf(cli.out, "Goroutines: %d\n", remoteInfo.GetInt("NGoroutines")) - fmt.Fprintf(cli.out, "LXC Version: %s\n", remoteInfo.Get("LXCVersion")) + fmt.Fprintf(cli.out, "Execution Driver: %s\n", remoteInfo.Get("ExecutionDriver")) fmt.Fprintf(cli.out, "EventsListeners: %d\n", remoteInfo.GetInt("NEventsListener")) fmt.Fprintf(cli.out, "Kernel Version: %s\n", remoteInfo.Get("KernelVersion")) diff --git a/components/engine/execdriver/chroot/driver.go b/components/engine/execdriver/chroot/driver.go index f3eba8304d..b9f3f04016 100644 --- a/components/engine/execdriver/chroot/driver.go +++ b/components/engine/execdriver/chroot/driver.go @@ -42,7 +42,7 @@ func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallba c.Rootfs, "/.dockerinit", "-driver", - d.Name(), + DriverName, } params = append(params, c.Entrypoint) params = append(params, c.Arguments...) diff --git a/components/engine/execdriver/lxc/driver.go b/components/engine/execdriver/lxc/driver.go index 6d1e1d29dc..eeef1f5370 100644 --- a/components/engine/execdriver/lxc/driver.go +++ b/components/engine/execdriver/lxc/driver.go @@ -84,7 +84,7 @@ func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallba "--", c.InitPath, "-driver", - d.Name(), + DriverName, } if c.Network != nil { diff --git a/components/engine/sysinit/sysinit.go b/components/engine/sysinit/sysinit.go index 7e1ac519cd..af69795cb6 100644 --- a/components/engine/sysinit/sysinit.go +++ b/components/engine/sysinit/sysinit.go @@ -5,6 +5,8 @@ import ( "flag" "fmt" "github.com/dotcloud/docker/execdriver" + _ "github.com/dotcloud/docker/execdriver/chroot" + _ "github.com/dotcloud/docker/execdriver/lxc" "io/ioutil" "log" "os"