Realign partitioning

ws2022/answer_files/Autounattend.xml.pkrtpl

@@ -55,7 +55,7 @@
             versionScope="nonSxS"
         >
 
-      <!-- UEFI GPT disk layout -->
+      <!-- UEFI GPT disk layout: EFI + MSR + OS + Recovery -->
       <DiskConfiguration>
         <Disk wcm:action="add">
           <DiskID>0</DiskID>
@@ -74,6 +74,11 @@
             <CreatePartition wcm:action="add">
               <Order>3</Order>
               <Type>Primary</Type>
+              <Size>${os_partition_mb}</Size>
+            </CreatePartition>
+            <CreatePartition wcm:action="add">
+              <Order>4</Order>
+              <Type>Primary</Type>
               <Extend>true</Extend>
             </CreatePartition>
           </CreatePartitions>
@@ -91,6 +96,13 @@
               <Label>Windows</Label>
               <Letter>C</Letter>
             </ModifyPartition>
+            <ModifyPartition wcm:action="add">
+              <Order>3</Order>
+              <PartitionID>4</PartitionID>
+              <Format>NTFS</Format>
+              <Label>Recovery</Label>
+              <TypeID>de94bba4-06d1-4d40-a16a-bfd50179d6ac</TypeID>
+            </ModifyPartition>
           </ModifyPartitions>
         </Disk>
       </DiskConfiguration>

ws2022/main.pkr.hcl

@@ -70,6 +70,7 @@ source "proxmox-iso" "ws2022" {
         locale          = var.locale
         timezone        = var.timezone
         virtio_drive    = var.virtio_drive_letter
+        os_partition_mb = var.os_partition_mb
       })
     }
     cd_label         = "OEMDRV"

ws2022/variables.pkr.hcl

@@ -47,7 +47,13 @@ variable "vm_cores" {
 
 variable "disk_size" {
   type    = string
-  default = "60G"
+  default = "80G"
+}
+
+variable "os_partition_mb" {
+  type        = number
+  default     = 80692
+  description = "OS (C:) partition size in MB. Formula: (disk_size_MB - 100 EFI - 128 MSR - 1000 Recovery). Default matches 80G disk."
 }
 
 variable "network_bridge" {