From 6eed7f0cac10495c95a8e4b74548e707af933f8c Mon Sep 17 00:00:00 2001 From: Darren Stahl Date: Mon, 27 Mar 2017 14:32:18 -0700 Subject: [PATCH] Windows:Revert change to wait for OOBE Signed-off-by: Darren Stahl --- daemon/daemon_windows.go | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go index 23ff5305d8..d58b51db6e 100644 --- a/daemon/daemon_windows.go +++ b/daemon/daemon_windows.go @@ -6,7 +6,6 @@ import ( "path/filepath" "strings" "syscall" - "unsafe" "github.com/Microsoft/hcsshim" "github.com/Sirupsen/logrus" @@ -245,7 +244,7 @@ func checkSystem() error { return fmt.Errorf("Failed to load vmcompute.dll. Ensure that the Containers role is installed.") } - return waitOOBEComplete() + return nil } // configureKernelSecuritySupport configures and validate security support for the kernel @@ -617,35 +616,3 @@ func (daemon *Daemon) verifyVolumesInfo(container *container.Container) error { func (daemon *Daemon) setupSeccompProfile() error { return nil } - -func waitOOBEComplete() error { - kernel32 := windows.NewLazySystemDLL("kernel32.dll") - registerWaitUntilOOBECompleted := kernel32.NewProc("RegisterWaitUntilOOBECompleted") - unregisterWaitUntilOOBECompleted := kernel32.NewProc("UnregisterWaitUntilOOBECompleted") - - callbackChan := make(chan struct{}) - callbackFunc := func(uintptr) uintptr { - close(callbackChan) - return 0 - } - callbackFuncPtr := syscall.NewCallback(callbackFunc) - - var callbackHandle syscall.Handle - ret, _, err := registerWaitUntilOOBECompleted.Call(callbackFuncPtr, 0, uintptr(unsafe.Pointer(&callbackHandle))) - if ret == 0 { - if err == errInvalidState { - return nil - } - return fmt.Errorf("failed to register OOBEComplete callback. Error: %v", err) - } - - // Wait for the callback when OOBE is finished - <-callbackChan - - ret, _, err = unregisterWaitUntilOOBECompleted.Call(uintptr(callbackHandle)) - if ret == 0 { - return fmt.Errorf("failed to unregister OOBEComplete callback. Error: %v", err) - } - - return nil -}