ソースを参照

Windows: Add service dependency ConDrv

Signed-off-by: Darren Stahl <darst@microsoft.com>
Darren Stahl 8 年 前
コミット
b2a7f6abb3
1 ファイル変更11 行追加0 行削除
  1. 11 0
      cmd/dockerd/service_windows.go

+ 11 - 0
cmd/dockerd/service_windows.go

@@ -13,6 +13,7 @@ import (
 	"unsafe"
 	"unsafe"
 
 
 	"github.com/Sirupsen/logrus"
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/system"
 	"github.com/spf13/pflag"
 	"github.com/spf13/pflag"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc"
 	"golang.org/x/sys/windows/svc"
@@ -165,10 +166,20 @@ func registerService() error {
 		return err
 		return err
 	}
 	}
 	defer m.Disconnect()
 	defer m.Disconnect()
+
+	depends := []string{}
+
+	// This dependency is required on build 14393 (RS1)
+	// it is added to the platform in newer builds
+	if system.GetOSVersion().Build == 14393 {
+		depends = append(depends, "ConDrv")
+	}
+
 	c := mgr.Config{
 	c := mgr.Config{
 		ServiceType:  windows.SERVICE_WIN32_OWN_PROCESS,
 		ServiceType:  windows.SERVICE_WIN32_OWN_PROCESS,
 		StartType:    mgr.StartAutomatic,
 		StartType:    mgr.StartAutomatic,
 		ErrorControl: mgr.ErrorNormal,
 		ErrorControl: mgr.ErrorNormal,
+		Dependencies: depends,
 		DisplayName:  "Docker Engine",
 		DisplayName:  "Docker Engine",
 	}
 	}