kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

pkg/system: move IsWindowsClient to pkg/parsers/operatingsystem

Browse source 
This function was only used in a single place, and pkg/parsers/operatingsystem
already copied the `verNTWorkstation` const, so we might as well move this function
there as well to "unclutter" pkg/system.

The function had no external users, so not adding an alias / stub.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-03-16 00:41:30 +01:00
parent 85c4d633db
commit 9bf40d7edd
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/daemon_windows.go
View file

@ -25,6 +25,7 @@ import (
"github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/parsers/operatingsystem"
"github.com/docker/docker/pkg/platform" "github.com/docker/docker/pkg/platform"
"github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/pkg/sysinfo"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
@ -553,7 +554,7 @@ func (daemon *Daemon) setDefaultIsolation() error {
// On client SKUs, default to Hyper-V. @engine maintainers. This // On client SKUs, default to Hyper-V. @engine maintainers. This
// should not be removed. Ping Microsoft folks is there are PRs to // should not be removed. Ping Microsoft folks is there are PRs to
// to change this. // to change this.
if system.IsWindowsClient() { if operatingsystem.IsWindowsClient() {
daemon.defaultIsolation = containertypes.IsolationHyperV daemon.defaultIsolation = containertypes.IsolationHyperV
} else { } else {
daemon.defaultIsolation = containertypes.IsolationProcess daemon.defaultIsolation = containertypes.IsolationProcess

6
pkg/parsers/operatingsystem/operatingsystem_windows.go
View file

@ -62,3 +62,9 @@ func GetOperatingSystemVersion() (string, error) {
func IsContainerized() (bool, error) { func IsContainerized() (bool, error) {
return false, nil return false, nil
} }
// IsWindowsClient returns true if the SKU is client. It returns false on
// Windows server.
func IsWindowsClient() bool {
return windows.RtlGetVersion().ProductType == verNTWorkstation
}

14
pkg/system/syscall_windows.go
View file

@ -1,14 +0,0 @@
package system // import "github.com/docker/docker/pkg/system"
import "golang.org/x/sys/windows"
// VER_NT_WORKSTATION, see https://docs.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-osversioninfoexa
const verNTWorkstation = 0x00000001 // VER_NT_WORKSTATION
// IsWindowsClient returns true if the SKU is client. It returns false on
// Windows server, or if an error occurred when making the GetVersionExW
// syscall.
func IsWindowsClient() bool {
ver := windows.RtlGetVersion()
return ver != nil && ver.ProductType == verNTWorkstation
}