1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #14484 from LK4D4/check_dockerinit_lxc

Check dockerinit only if lxc driver is used
This commit is contained in:
Jessie Frazelle 2015-07-09 14:47:03 -07:00
commit c9e2a71509

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)