CA-37034-Lenny-install-ISO-warning | 35 +++++++++++++++++++++++++++++++++++ series | 1 + 2 files changed, 36 insertions(+), 0 deletions(-)
# HG changeset patch # User Thomas Sanders <[email protected]> # Date 1286202542 -3600 # Node ID d2ed8621e47490516a043fcd12e0830119f316c6 # Parent 899b71501138928e1cccaf81f70a4200b2830ae7 CA-37304: Debian Lenny install-from-CD has a message now to say the standard ISO will not work, and where to find a Xen-compatible one. Also a message for Debian Squeeze saying the multi-arch ISO is needed. diff --git a/CA-37034-Lenny-install-ISO-warning b/CA-37034-Lenny-install-ISO-warning new file mode 100644 --- /dev/null +++ b/CA-37034-Lenny-install-ISO-warning @@ -0,0 +1,36 @@ +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. + +diff --git a/ocaml/xapi/create_templates.ml b/ocaml/xapi/create_templates.ml +--- 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 +@@ -81,7 +81,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 +@@ -441,6 +441,10 @@ let debian_template name release archite + 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." ++ | _ -> "") + } + + (* Main entry point ----------------------------------------------------------*) diff --git a/series b/series --- a/series +++ b/series @@ -263,3 +263,4 @@ CA-43936-local-session-should-no-try-to- api-doc-version-number ca-44277 cli-vm-create-add-sharable-param +CA-37034-Lenny-install-ISO-warning
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
