Revert to v2.5 schema GuestStateFileType to support release target OS (…

…#1318) Signed-off-by: Ken Gordon <ken.gordon@microsoft.com>
microsoft · Mar 11, 2022 · 041d23c · 041d23c
1 parent 5f4ec16
commit 041d23c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/internal/uvm/create_lcow.go b/internal/uvm/create_lcow.go
@@ -257,14 +257,13 @@ Example JSON document produced once the hcsschema.ComputeSytem returned by makeL
  },
  "GuestState": {
  "GuestStateFilePath": "d:\\ken\\aug27\\gcsinitnew.vmgs",
- "GuestStateFileType": "BlockStorage",
+ "GuestStateFileType": "FileMode",
  "ForceTransientState": true
  },
  "SecuritySettings": {
  "Isolation": {
  "IsolationType": "SecureNestedPaging",
- "LaunchData": "kBifgKNijdHjxdSUshmavrNofo2B01LiIi1cr8R4ytI=",
- "HclEnabled": true
+ "LaunchData": "kBifgKNijdHjxdSUshmavrNofo2B01LiIi1cr8R4ytI="
  }
  },
  "Version": {
@@ -381,7 +380,7 @@ func makeLCOWVMGSDoc(ctx context.Context, opts *OptionsLCOW, uvm *UtilityVM) (_
 
  doc.VirtualMachine.GuestState = &hcsschema.GuestState{
  GuestStateFilePath: vmgsFullPath,
- GuestStateFileType: "BlockStorage",
+ GuestStateFileType: "FileMode",
  ForceTransientState: true, // tell HCS that this is just the source of the images, not ongoing state
  }
 
@@ -426,7 +425,7 @@ func makeLCOWSecurityDoc(ctx context.Context, opts *OptionsLCOW, uvm *UtilityVM)
  Isolation: &hcsschema.IsolationSettings{
  IsolationType: "SecureNestedPaging",
  LaunchData: securityPolicyHash,
- HclEnabled: true,
+ // HclEnabled: true, /* Not available in schema 2.5 - REQUIRED when using BlockStorage in 2.6 */
  },
  }
 

diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/uvm/create_lcow.go b/test/vendor/github.com/Microsoft/hcsshim/internal/uvm/create_lcow.go