Skip to content

CP-17631: Don't default HVM keymap to en-us #2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2016
Merged

CP-17631: Don't default HVM keymap to en-us #2676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ocaml/xapi/xapi_xenops.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,10 @@ let builder_of_vm ~__context (vmref, vm) timeoffset pci_passthrough vgpu =
| _, Some value -> Some value
| Some value, None -> Some value
end;
keymap = Some (string vm.API.vM_platform "en-us" "keymap");
keymap = begin
try Some (List.assoc "keymap" vm.API.vM_platform)
with Not_found -> None
end;
vnc_ip = None (*None PR-1255*);
pci_emulations = pci_emulations;
pci_passthrough = pci_passthrough;
Expand Down