Fix a bug which caused dockerd to crash at startup if a container didn't have a registered mountpoint

This commit is contained in:
Solomon Hykes 2013-03-11 17:05:01 -07:00
Родитель 687d6f25ee
Коммит 2548722dae
1 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -1,9 +1,9 @@
package docker
import (
"github.com/dotcloud/docker/fs"
"encoding/json"
"errors"
"github.com/dotcloud/docker/fs"
"github.com/kr/pty"
"io"
"io/ioutil"
@ -129,6 +129,8 @@ func loadContainer(store *fs.Store, containerPath string, netManager *NetworkMan
)
if err != nil {
return nil, err
} else if mountpoint == nil {
return nil, errors.New("Couldn't load container: unregistered mountpoint.")
}
container := &Container{
stdout: newWriteBroadcaster(),