Browse Source

Merge pull request #14484 from LK4D4/check_dockerinit_lxc

Check dockerinit only if lxc driver is used
Jessie Frazelle 10 years ago
parent
commit
c9e2a71509
1 changed files with 7 additions and 3 deletions
  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)