0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #24676 from coolljt0725/fix_24674

Browse source 
Fix daemon panic use wrong graphdriver with --live-restore flag
This commit is contained in:
Alexander Morozov 2016-07-15 08:44:01 -07:00 • committed by GitHub
commit f553362ae5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon.go
View file

@ -651,7 +651,7 @@ func (daemon *Daemon) Shutdown() error {
daemon.shutdown = true
// Keep mounts and networking running on daemon shutdown if
// we are to keep containers running and restore them.
if daemon.configStore.LiveRestore {
if daemon.configStore.LiveRestore && daemon.containers != nil {
// check if there are any running containers, if none we should do some cleanup
if ls, err := daemon.Containers(&types.ContainerListOptions{}); len(ls) != 0 || err != nil {
return nil