Updating Windows configuration profiles (#29590)

- Updating Windows configuration profiles to prevent race condition
2025-05-29 13:31:44 -05:00
parent 7a54a2de22
commit d3392873d8
3 changed files with 13 additions and 27 deletions
@@ -43,3 +43,16 @@
    <Data>1</Data>
  </Item>
 </Replace>
+<Replace>
+  <!-- Enforce screenlock after 15 minutes -->
+  <CmdID>2</CmdID>
+  <Item>
+    <Meta>
+      <Format xmlns="syncml:metinf">int</Format>
+    </Meta>
+    <Target>
+      <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/MaxInactivityTimeDeviceLock</LocURI>
+    </Target>
+    <Data>15</Data>
+  </Item>
+</Replace>
@@ -1,26 +0,0 @@
-<Replace>
-  <!-- Enforce screenlock -->
-  <CmdID>1</CmdID>
-  <Item>
-    <Meta>
-      <Format xmlns="syncml:metinf">int</Format>
-    </Meta>
-    <Target>
-      <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/DevicePasswordEnabled</LocURI>
-    </Target>
-    <Data>1</Data>
-  </Item>
-</Replace>
-<Replace>
-  <!-- Enforce screenlock after 15 minutes -->
-  <CmdID>2</CmdID>
-  <Item>
-    <Meta>
-      <Format xmlns="syncml:metinf">int</Format>
-    </Meta>
-    <Target>
-      <LocURI>./Device/Vendor/MSFT/Policy/Config/DeviceLock/MaxInactivityTimeDeviceLock</LocURI>
-    </Target>
-    <Data>15</Data>
-  </Item>
-</Replace>
@@ -112,7 +112,6 @@ controls:
    custom_settings:
      - path: ../lib/windows/configuration-profiles/enable-firewall-all-domains.xml
      - path: ../lib/windows/configuration-profiles/password.xml
-      - path: ../lib/windows/configuration-profiles/screen-lock.xml
      - path: ../lib/windows/configuration-profiles/advanced-logging-powershell.xml
      - path: ../lib/windows/configuration-profiles/autoset-time-date.xml
      - path: ../lib/windows/configuration-profiles/disable-onedrive.xml