зеркало из https://github.com/microsoft/docker.git
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>
This commit is contained in:
Родитель
42eb82ae92
Коммит
96bc377a8d
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче