浏览代码

Check dockerinit only if lxc driver is used

This allow you to run dynamically linked docker without compiling
dockerinit.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Alexander Morozov 10 年之前
父节点
当前提交
96bc377a8d
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      daemon/daemon.go

+ 7 - 3
daemon/daemon.go

@@ -698,9 +698,13 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
 
 	d.containerGraph = graph
 
-	sysInitPath, err := configureSysInit(config)
-	if err != nil {
-		return nil, err
+	var sysInitPath string
+	if config.ExecDriver == "lxc" {
+		initPath, err := configureSysInit(config)
+		if err != nil {
+			return nil, err
+		}
+		sysInitPath = initPath
 	}
 
 	sysInfo := sysinfo.New(false)