p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14484 from LK4D4/check_dockerinit_lxc

Browse Source 
Check dockerinit only if lxc driver is used
Upstream-commit: c9e2a71509743ea38baafb71d7efa8b205af14b4
Component: engine
This commit is contained in:
Jessie Frazelle
2015-07-09 14:47:03 -07:00
parent 39f872f4ab 48bfe58a0d
commit c104f21d9a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/engine/daemon/daemon.go
View File

@ -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)