From 84bcc9b66c37cb7a7f97c6fc350876d60d3f7244 Mon Sep 17 00:00:00 2001
From: Git Sagar <git@sagar.ch>
Date: Mon, 8 Jun 2026 14:51:41 +0530
Subject: [PATCH] skip MAS activation when enableRDP is set

MAS HWID switches Enterprise LTSC to IoT Enterprise S which lacks
the RDP server listener. Skip activation to preserve the edition.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lib/images/windows/templates/generalize.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/images/windows/templates/generalize.nix b/lib/images/windows/templates/generalize.nix
index 8af01c0..431f664 100644
--- a/lib/images/windows/templates/generalize.nix
+++ b/lib/images/windows/templates/generalize.nix
@@ -79,6 +79,9 @@ in
     powershell -Command "Get-AppxPackage *MicrosoftEdgeDevToolsClient* | Remove-AppxPackage -ErrorAction SilentlyContinue"
 
 
+    ${if enableRDP then ''
+    :: Skip MAS activation when RDP is enabled (MAS switches edition to IoT which lacks RDP server)
+    '' else ''
     :: Activate Windows using HWID method
     if exist C:\MAS_AIO.cmd (
       echo. | call C:\MAS_AIO.cmd /HWID
@@ -89,6 +92,7 @@ in
         echo. | call C:\MAS_AIO.cmd /Ohook
       )
     )
+    ''}
     del /q C:\MAS_AIO.cmd 2>nul
 
     ${lib.optionalString enableRDP ''