Skip to content

Commit 210811d

Browse files
committed
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 <[email protected]>
1 parent 2434885 commit 210811d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

ocaml/xapi/create_templates.ml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(*
2-
* Copyright (C) 2006-2009 Citrix Systems Inc.
2+
* Copyright (C) 2006-2010 Citrix Systems Inc.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* 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 =
8282
Client.SR.scan rpc session_id sr
8383
with e ->
8484
error "Scan of tools SR failed - exception was '%s'" (ExnHelper.string_of_exn e);
85-
error "Ignorining error and continuing"
85+
error "Ignoring error and continuing"
8686
end;
8787

8888
let vdis = Client.SR.get_VDIs rpc session_id sr in
@@ -418,6 +418,10 @@ let debian_template name release architecture flags =
418418
let bt = eli_install_template (default_memory_parameters 128L) name "debianlike" false "-- quiet console=hvc0" in
419419
{ bt with
420420
vM_other_config = (install_methods_otherconfig_key, "cdrom,http,ftp") :: ("install-arch", install_arch) :: ("debian-release", release) :: bt.vM_other_config;
421+
vM_name_description = bt.vM_name_description ^ (match release with
422+
| "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"
423+
| "squeeze" -> "\nIn order to install Debian Squeeze from CD/DVD the multi-arch ISO image is required."
424+
| _ -> "")
421425
}
422426

423427
let create_all_templates rpc session_id =

0 commit comments

Comments
 (0)