Pārlūkot izejas kodu

Make sure drivers are registerd within sysinit

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Michael Crosby 11 gadi atpakaļ
vecāks
revīzija
97c8450705
4 mainītis faili ar 5 papildinājumiem un 3 dzēšanām
  1. 1 1
      commands.go
  2. 1 1
      execdriver/chroot/driver.go
  3. 1 1
      execdriver/lxc/driver.go
  4. 2 0
      sysinit/sysinit.go

+ 1 - 1
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"))
 

+ 1 - 1
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...)

+ 1 - 1
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 {

+ 2 - 0
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"