From 676dd4d04464883064836cb2374893541e8bc498 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 4 Sep 2013 12:03:45 +0200 Subject: [PATCH] Server: Pass in device-mapper DeviceSet to server This makes docker (but not docker-init) link to libdevmapper and will allow it to use the DeviceSet Upstream-commit: 87e248f52458eca2a40ed6e54e36de89228f6790 Component: engine --- components/engine/docker/docker.go | 3 ++- components/engine/server.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go index a0021f3a87..4dcc174d5e 100644 --- a/components/engine/docker/docker.go +++ b/components/engine/docker/docker.go @@ -4,6 +4,7 @@ import ( "flag" "fmt" "github.com/dotcloud/docker" + "github.com/dotcloud/docker/devmapper" "github.com/dotcloud/docker/utils" "io/ioutil" "log" @@ -133,7 +134,7 @@ func daemon(pidfile string, flGraphPath string, protoAddrs []string, autoRestart if flDns != "" { dns = []string{flDns} } - server, err := docker.NewServer(flGraphPath, autoRestart, enableCors, dns) + server, err := docker.NewServer(flGraphPath, devmapper.NewDeviceSetDM(flGraphPath), autoRestart, enableCors, dns) if err != nil { return err } diff --git a/components/engine/server.go b/components/engine/server.go index 88c32d17e1..295b7d80b9 100644 --- a/components/engine/server.go +++ b/components/engine/server.go @@ -1294,7 +1294,7 @@ func (srv *Server) ContainerCopy(name string, resource string, out io.Writer) er } -func NewServer(flGraphPath string, autoRestart, enableCors bool, dns ListOpts) (*Server, error) { +func NewServer(flGraphPath string, deviceSet DeviceSet, autoRestart, enableCors bool, dns ListOpts) (*Server, error) { if runtime.GOARCH != "amd64" { log.Fatalf("The docker runtime currently only supports amd64 (not %s). This will change in the future. Aborting.", runtime.GOARCH) }