30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
Index: xen-3.2.1-testing/tools/python/xen/xend/image.py
|
||
|
|
===================================================================
|
||
|
|
--- xen-3.2.1-testing.orig/tools/python/xen/xend/image.py
|
||
|
|
+++ xen-3.2.1-testing/tools/python/xen/xend/image.py
|
||
|
|
@@ -194,12 +194,16 @@ class ImageHandler:
|
||
|
|
ret.append('-nographic')
|
||
|
|
return ret
|
||
|
|
|
||
|
|
+ keymap = vmConfig['platform'].get("keymap")
|
||
|
|
+
|
||
|
|
vnc_config = {}
|
||
|
|
has_vnc = int(vmConfig['platform'].get('vnc', 0)) != 0
|
||
|
|
has_sdl = int(vmConfig['platform'].get('sdl', 0)) != 0
|
||
|
|
for dev_uuid in vmConfig['console_refs']:
|
||
|
|
dev_type, dev_info = vmConfig['devices'][dev_uuid]
|
||
|
|
if dev_type == 'vfb':
|
||
|
|
+ if 'keymap' in dev_info:
|
||
|
|
+ keymap = dev_info.get('keymap',{})
|
||
|
|
vfb_type = dev_info.get('type', {})
|
||
|
|
if vfb_type == 'sdl':
|
||
|
|
self.display = dev_info.get('display', {})
|
||
|
|
@@ -210,7 +214,6 @@ class ImageHandler:
|
||
|
|
has_vnc = True
|
||
|
|
break
|
||
|
|
|
||
|
|
- keymap = vmConfig['platform'].get("keymap")
|
||
|
|
if keymap:
|
||
|
|
ret.append("-k")
|
||
|
|
ret.append(keymap)
|