@@ -155,6 +155,8 @@ func (cli *DaemonCli) start(opts daemonOptions) (err error) {

 	api := apiserver.New(serverConfig)

 	cli.api = api

+	var hosts []string

+

 	for i := 0; i < len(cli.Config.Hosts); i++ {

 		var err error

 		if cli.Config.Hosts[i], err = dopts.ParseHost(cli.Config.TLS, cli.Config.Hosts[i]); err != nil {

@@ -186,6 +188,7 @@ func (cli *DaemonCli) start(opts daemonOptions) (err error) {

 			}

 		}

 		logrus.Debugf("Listener created for HTTP on %s (%s)", proto, addr)

+		hosts = append(hosts, protoAddrParts[1])

 		api.Accept(addr, ls...)

 	}

@@ -213,6 +216,8 @@ func (cli *DaemonCli) start(opts daemonOptions) (err error) {

 		return fmt.Errorf("Error starting daemon: %v", err)

 	}

+	d.StoreHosts(hosts)

+

 	// validate after NewDaemon has restored enabled plugins. Dont change order.

 	if err := validateAuthzPlugins(cli.Config.AuthorizationPlugins, pluginStore); err != nil {

 		return fmt.Errorf("Error validating authorization plugin: %v", err)

@@ -116,6 +116,17 @@ type Daemon struct {

 	diskUsageRunning int32

 	pruneRunning     int32

+	hosts            map[string]bool // hosts stores the addresses the daemon is listening on

+}

+

+// StoreHosts stores the addresses the daemon is listening on

+func (daemon *Daemon) StoreHosts(hosts []string) {

+	if daemon.hosts == nil {

+		daemon.hosts = make(map[string]bool)

+	}

+	for _, h := range hosts {

+		daemon.hosts[h] = true

+	}

 }

 // HasExperimental returns whether the experimental features of the daemon are enabled or not

@@ -46,7 +46,8 @@ func (daemon *Daemon) StateChanged(id string, e libcontainerd.StateInfo) error {

 		c.StreamConfig.Wait()

 		c.Reset(false)

-		restart, wait, err := c.RestartManager().ShouldRestart(e.ExitCode, c.HasBeenManuallyStopped, time.Since(c.StartedAt))

+		// If daemon is being shutdown, don't let the container restart

+		restart, wait, err := c.RestartManager().ShouldRestart(e.ExitCode, daemon.IsShuttingDown() || c.HasBeenManuallyStopped, time.Since(c.StartedAt))

 		if err == nil && restart {

 			c.RestartCount++

 			c.SetRestarting(platformConstructExitStatus(e))

@@ -6,6 +6,7 @@ package daemon

 import (

 	"encoding/json"

+	"fmt"

 	"os"

 	"path/filepath"

 	"sort"

@@ -42,8 +43,19 @@ func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, er

 		if err := daemon.lazyInitializeVolume(c.ID, m); err != nil {

 			return nil, err

 		}

+		// If the daemon is being shutdown, we should not let a container start if it is trying to

+		// mount the socket the daemon is listening on. During daemon shutdown, the socket

+		// (/var/run/docker.sock by default) doesn't exist anymore causing the call to m.Setup to

+		// create at directory instead. This in turn will prevent the daemon to restart.

+		checkfunc := func(m *volume.MountPoint) error {

+			if _, exist := daemon.hosts[m.Source]; exist && daemon.IsShuttingDown() {

+				return fmt.Errorf("Could not mount %q to container while the daemon is shutting down", m.Source)

+			}

+			return nil

+		}

+

 		rootUID, rootGID := daemon.GetRemappedUIDGID()

-		path, err := m.Setup(c.MountLabel, rootUID, rootGID)

+		path, err := m.Setup(c.MountLabel, rootUID, rootGID, checkfunc)

 		if err != nil {

 			return nil, err

 		}

@@ -24,7 +24,7 @@ func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, er

 		if err := daemon.lazyInitializeVolume(c.ID, mount); err != nil {

 			return nil, err

 		}

-		s, err := mount.Setup(c.MountLabel, 0, 0)

+		s, err := mount.Setup(c.MountLabel, 0, 0, nil)

 		if err != nil {

 			return nil, err

 		}

@@ -146,7 +146,9 @@ func (m *MountPoint) Cleanup() error {

 // Setup sets up a mount point by either mounting the volume if it is

 // configured, or creating the source directory if supplied.

-func (m *MountPoint) Setup(mountLabel string, rootUID, rootGID int) (path string, err error) {

+// The, optional, checkFun parameter allows doing additional checking

+// before creating the source directory on the host.

+func (m *MountPoint) Setup(mountLabel string, rootUID, rootGID int, checkFun func(m *MountPoint) error) (path string, err error) {

 	defer func() {

 		if err == nil {

 			if label.RelabelNeeded(m.Mode) {

@@ -181,6 +183,14 @@ func (m *MountPoint) Setup(mountLabel string, rootUID, rootGID int) (path string

 	// system.MkdirAll() produces an error if m.Source exists and is a file (not a directory),

 	if m.Type == mounttypes.TypeBind {

+		// Before creating the source directory on the host, invoke checkFun if it's not nil. One of

+		// the use case is to forbid creating the daemon socket as a directory if the daemon is in

+		// the process of shutting down.

+		if checkFun != nil {

+			if err := checkFun(m); err != nil {

+				return "", err

+			}

+		}

 		// idtools.MkdirAllNewAs() produces an error if m.Source exists and is a file (not a directory)

 		// also, makes sure that if the directory is created, the correct remapped rootUID/rootGID will own it

 		if err := idtools.MkdirAllNewAs(m.Source, 0755, rootUID, rootGID); err != nil {