From: Thomas Sanders Date: Tue, 12 Oct 2010 10:59:58 +0000 (+0100) Subject: CA-37034 Lenny install-from-CD warning dialog X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0e60172849bf6da3a5799bc755db1138866f1eaf;p=xcp%2Fxen-api.git CA-37034 Lenny install-from-CD warning dialog The installation template for Debian Lenny now warns that the standard CD/DVD does not support XenServer, and gives directions to find ISOs that work. For Debian Squeeze, there is now a warning that a multi-arch image is needed. Signed-off-by: Thomas Sanders --- diff --git a/ocaml/xapi/create_templates.ml b/ocaml/xapi/create_templates.ml index 924d0d08..5baad31b 100644 --- a/ocaml/xapi/create_templates.ml +++ b/ocaml/xapi/create_templates.ml @@ -1,5 +1,5 @@ (* - * Copyright (C) 2006-2009 Citrix Systems Inc. + * Copyright (C) 2006-2010 Citrix Systems Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -82,7 +82,7 @@ let find_xs_tools_vdi rpc session_id = Client.SR.scan rpc session_id sr with e -> error "Scan of tools SR failed - exception was '%s'" (ExnHelper.string_of_exn e); - error "Ignorining error and continuing" + error "Ignoring error and continuing" end; let vdis = Client.SR.get_VDIs rpc session_id sr in @@ -418,6 +418,10 @@ let debian_template name release architecture flags = let bt = eli_install_template (default_memory_parameters 128L) name "debianlike" false "-- quiet console=hvc0" in { bt with vM_other_config = (install_methods_otherconfig_key, "cdrom,http,ftp") :: ("install-arch", install_arch) :: ("debian-release", release) :: bt.vM_other_config; + vM_name_description = bt.vM_name_description ^ (match release with + | "lenny" -> "\nOfficial Debian Lenny CD/DVD images do not support XenServer. To find ISO images that do, please refer to: http://community.citrix.com/display/xs/Debian+Lenny" + | "squeeze" -> "\nIn order to install Debian Squeeze from CD/DVD the multi-arch ISO image is required." + | _ -> "") } let create_all_templates rpc session_id =