From 39b838e8fdba4ae9439a37754710dd5610049445 Mon Sep 17 00:00:00 2001
From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Date: Thu, 22 Feb 2024 16:12:24 +0100
Subject: [PATCH] [Windows] Add Wireless LAN feature (#9373)

* [Windows] Add Wireless LAN feature

* Change WLAN service startup type to manual

* Update template directly
---
 images/windows/scripts/tests/WindowsFeatures.Tests.ps1 | 4 ++++
 images/windows/templates/windows-2019.pkr.hcl          | 4 ++++
 images/windows/templates/windows-2022.pkr.hcl          | 4 ++++
 images/windows/toolsets/toolset-2019.json              | 3 ++-
 images/windows/toolsets/toolset-2022.json              | 3 ++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1
index 633de532f..03b56a210 100644
--- a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1
+++ b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1
@@ -13,6 +13,10 @@ Describe "WindowsFeatures" {
     it "Check WSL is on path" {
         (Get-Command -Name 'wsl') | Should -BeTrue
     }
+
+    it "Check WLAN service is stopped" {
+        (Get-Service -Name wlansvc).Status | Should -Be "Stopped"
+    }
 }
 
 Describe "DiskSpace" {
diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl
index 203805289..9c734d633 100644
--- a/images/windows/templates/windows-2019.pkr.hcl
+++ b/images/windows/templates/windows-2019.pkr.hcl
@@ -272,6 +272,10 @@ build {
     restart_timeout = "30m"
   }
 
+  provisioner "powershell" {
+    inline = ["Set-Service -Name wlansvc -StartupType Manual", "if ($(Get-Service -Name wlansvc).Status -eq 'Running') { Stop-Service -Name wlansvc}"]
+  }
+
   provisioner "powershell" {
     environment_vars = ["IMAGE_FOLDER=${var.image_folder}"]
     scripts          = [
diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl
index 70bb6c5a6..2fb94ea72 100644
--- a/images/windows/templates/windows-2022.pkr.hcl
+++ b/images/windows/templates/windows-2022.pkr.hcl
@@ -263,6 +263,10 @@ build {
     restart_timeout       = "10m"
   }
 
+  provisioner "powershell" {
+    inline = ["Set-Service -Name wlansvc -StartupType Manual", "if ($(Get-Service -Name wlansvc).Status -eq 'Running') { Stop-Service -Name wlansvc}"]
+  }
+
   provisioner "powershell" {
     environment_vars = ["IMAGE_FOLDER=${var.image_folder}"]
     scripts          = [
diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json
index ad7a68e80..c6fb5e4e5 100644
--- a/images/windows/toolsets/toolset-2019.json
+++ b/images/windows/toolsets/toolset-2019.json
@@ -260,7 +260,8 @@
         { "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true },
         { "name": "Containers" },
         { "name": "Microsoft-Windows-Subsystem-Linux", "optionalFeature": true },
-        { "name": "VirtualMachinePlatform", "optionalFeature": true }
+        { "name": "VirtualMachinePlatform", "optionalFeature": true },
+        { "name": "Wireless-Networking" }
     ],
     "visualStudio": {
         "version" : "2019",
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index bd39044be..cad4d23f3 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -170,7 +170,8 @@
         { "name": "NET-Framework-Features", "includeAllSubFeatures": true },
         { "name": "Hyper-V", "includeAllSubFeatures": true },
         { "name": "HypervisorPlatform", "optionalFeature": true },
-        { "name": "Hyper-V-PowerShell" }
+        { "name": "Hyper-V-PowerShell" },
+        { "name": "Wireless-Networking" }
     ],
     "visualStudio": {
         "version" : "2022",