Merge pull request #20481 from HackToday/addcheckfd

Add check for non-systemd fd use case
Upstream-commit: dd53ab14e4adb3d54fbd102dcce6bc476e5b3310
Component: engine
This commit is contained in:
David Calavera
2016-02-25 16:38:53 -08:00
@@ -59,7 +59,7 @@ func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {
}
if len(listeners) == 0 {
return nil, fmt.Errorf("No sockets found")
return nil, fmt.Errorf("No sockets found. Make sure the docker daemon was started by systemd.")
}
// default to all fds just like unix:// and tcp://