Signed-off-by: Darren Stahl <darst@microsoft.com>
Darren Stahl authored on 2017/03/28 06:32:18... | ... |
@@ -6,7 +6,6 @@ import ( |
6 | 6 |
"path/filepath" |
7 | 7 |
"strings" |
8 | 8 |
"syscall" |
9 |
- "unsafe" |
|
10 | 9 |
|
11 | 10 |
"github.com/Microsoft/hcsshim" |
12 | 11 |
"github.com/Sirupsen/logrus" |
... | ... |
@@ -245,7 +244,7 @@ func checkSystem() error { |
245 | 245 |
return fmt.Errorf("Failed to load vmcompute.dll. Ensure that the Containers role is installed.") |
246 | 246 |
} |
247 | 247 |
|
248 |
- return waitOOBEComplete() |
|
248 |
+ return nil |
|
249 | 249 |
} |
250 | 250 |
|
251 | 251 |
// configureKernelSecuritySupport configures and validate security support for the kernel |
... | ... |
@@ -617,35 +616,3 @@ func (daemon *Daemon) verifyVolumesInfo(container *container.Container) error { |
617 | 617 |
func (daemon *Daemon) setupSeccompProfile() error { |
618 | 618 |
return nil |
619 | 619 |
} |
620 |
- |
|
621 |
-func waitOOBEComplete() error { |
|
622 |
- kernel32 := windows.NewLazySystemDLL("kernel32.dll") |
|
623 |
- registerWaitUntilOOBECompleted := kernel32.NewProc("RegisterWaitUntilOOBECompleted") |
|
624 |
- unregisterWaitUntilOOBECompleted := kernel32.NewProc("UnregisterWaitUntilOOBECompleted") |
|
625 |
- |
|
626 |
- callbackChan := make(chan struct{}) |
|
627 |
- callbackFunc := func(uintptr) uintptr { |
|
628 |
- close(callbackChan) |
|
629 |
- return 0 |
|
630 |
- } |
|
631 |
- callbackFuncPtr := syscall.NewCallback(callbackFunc) |
|
632 |
- |
|
633 |
- var callbackHandle syscall.Handle |
|
634 |
- ret, _, err := registerWaitUntilOOBECompleted.Call(callbackFuncPtr, 0, uintptr(unsafe.Pointer(&callbackHandle))) |
|
635 |
- if ret == 0 { |
|
636 |
- if err == errInvalidState { |
|
637 |
- return nil |
|
638 |
- } |
|
639 |
- return fmt.Errorf("failed to register OOBEComplete callback. Error: %v", err) |
|
640 |
- } |
|
641 |
- |
|
642 |
- // Wait for the callback when OOBE is finished |
|
643 |
- <-callbackChan |
|
644 |
- |
|
645 |
- ret, _, err = unregisterWaitUntilOOBECompleted.Call(uintptr(callbackHandle)) |
|
646 |
- if ret == 0 { |
|
647 |
- return fmt.Errorf("failed to unregister OOBEComplete callback. Error: %v", err) |
|
648 |
- } |
|
649 |
- |
|
650 |
- return nil |
|
651 |
-} |