0001-BUGFIX.patch
| b/karesansui/gadget/guestby1display.py | ||
|---|---|---|
| 84 | 84 |
else: |
| 85 | 85 |
check = True |
| 86 | 86 |
|
| 87 |
hypervisor = "KVM" |
|
| 88 |
if obj.input.VMType == 'XEN': |
|
| 89 |
hypervisor = "XEN" |
|
| 90 |
elif obj.input.VMType == 'KVM': |
|
| 91 |
hypervisor = "KVM" |
|
| 92 |
|
|
| 87 | 93 |
if not is_param(obj.input, 'keymap'): |
| 88 | 94 |
check = False |
| 89 | 95 |
checker.add_error(_('"%s" is required.') % _('VNC Keymap'))
|
| ... | ... | |
| 91 | 97 |
check = checker.check_keymap( |
| 92 | 98 |
_('VNC Keymap'),
|
| 93 | 99 |
obj.input.keymap, |
| 94 |
CHECK_EMPTY | CHECK_EXIST |
|
| 95 |
) and check |
|
| 100 |
CHECK_EMPTY | CHECK_EXIST, |
|
| 101 |
hypervisor) and check |
|
| 96 | 102 |
|
| 97 | 103 |
obj.view.alert = checker.errors |
| 98 | 104 |
return check |
| ... | ... | |
| 127 | 133 |
self.view.keymaps = eval("get_keymaps(%s_KEYMAP_DIR)" % kvc.hypervisor.upper())
|
| 128 | 134 |
self.view.info = info |
| 129 | 135 |
self.view.guest = model |
| 136 |
self.view.VMType = virt.get_info()['VMType'] |
|
| 137 |
|
|
| 130 | 138 |
finally: |
| 131 | 139 |
kvc.close() |
| 132 | 140 |
|
| b/karesansui/templates/default/guestby1display/guestby1display.input | ||
|---|---|---|
| 101 | 101 |
<input type="radio" name="change_passwd" value="empty" id="change_passwd_empty" />${_("Don't set password")}
|
| 102 | 102 |
</div> |
| 103 | 103 |
|
| 104 |
<input type="hidden" name="VMType" value="${VMType}">
|
|
| 105 |
|
|
| 104 | 106 |
<div class="grayout-param">${_('VNC Keymap')}(${_('Keymap of the keyboard to use with VNC.')})<span id="device_display_bootup_vnc_keymap_help" /></div>
|
| 105 | 107 |
<div class="grayout-value grayout-form"> |
| 106 | 108 |
<select id="keymap" name="keymap"> |
| 107 |
- |
|