# HG changeset patch # User Marcus Granado # Date 1290190682 0 # Node ID bdf8414071ff96b4b14aee2378ae66c91e64d043 # Parent 55b1a5995e631d9c8ef0988b1d877ea2c46445f0 PR-1089: add solaris 10 template For solaris, viridian must be false; nx is enabled in template. Signed-off-by: Marcus Granado diff -r 55b1a5995e63 -r bdf8414071ff ocaml/xapi/create_templates.ml --- a/ocaml/xapi/create_templates.ml +++ b/ocaml/xapi/create_templates.ml @@ -315,14 +315,16 @@ | X32 | X64 | X64_debianlike + | X64_sol let friendly_string_of_architecture = function | X32 -> "(32-bit)" | X64 | X64_debianlike -> "(64-bit)" + | X64_sol -> "" let technical_string_of_architecture = function | X32 -> "i386" - | X64 -> "x86_64" + | X64 | X64_sol -> "x86_64" | X64_debianlike -> "amd64" let make_long_name name architecture is_experimental = @@ -343,7 +345,7 @@ } in let maximum_supported_memory_mib = match architecture with | X32 -> 4 - | X64 | X64_debianlike -> 32 in + | X64 | X64_sol| X64_debianlike -> 32 in let base = other_install_media_template (default_memory_parameters (Int64.of_int minimum_supported_memory_mib)) in let xen_app = List.mem XenApp flags in @@ -524,6 +526,7 @@ hvm_template "Windows Server 2008" X64 512 24 [n;x;v;]; hvm_template "Windows Server 2008 R2" X64 512 24 [n; v;]; hvm_template "Windows Server 2008 R2" X64 512 24 [n;x;v;]; + hvm_template "Solaris 10" X64_sol ~is_experimental:true 1024 24 [n; ]; ] in (* put default_template key in static_templates other_config of static_templates: *)