Преглед на файлове

Merge pull request #36065 from Microsoft/jjh/bumprs3andlcowsupported

Bump to RS3 final build, and remove LCOW_SUPPORTED
Akihiro Suda преди 7 години
родител
ревизия
ef3f7d18da
променени са 1 файла, в които са добавени 1 реда и са изтрити 6 реда
  1. 1 6
      pkg/system/init_windows.go

+ 1 - 6
pkg/system/init_windows.go

@@ -1,17 +1,12 @@
 package system
 
-import "os"
-
 // lcowSupported determines if Linux Containers on Windows are supported.
 var lcowSupported = false
 
 // InitLCOW sets whether LCOW is supported or not
-// TODO @jhowardmsft.
-// 1. Replace with RS3 RTM build number.
-// 2. Remove the getenv check when image-store is coalesced as shouldn't be needed anymore.
 func InitLCOW(experimental bool) {
 	v := GetOSVersion()
-	if experimental && v.Build > 16278 && os.Getenv("LCOW_SUPPORTED") != "" {
+	if experimental && v.Build >= 16299 {
 		lcowSupported = true
 	}
 }