Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable linux-stubdom by default

Browse Source 
Also, make it possible to set default on a template for its VMs.

QubesOS/qubes-issues#2185
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-16 09:01:40 +02:00
parent f7094bec4f
commit d4353c2a30
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/vm/qubesvm.py
View File

@ -1145,7 +1145,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
if self.stubdom_mem: if self.stubdom_mem:
stubdom_mem = self.stubdom_mem stubdom_mem = self.stubdom_mem
else: else:
if self.features.get('linux-stubdom', False): if self.features.check_with_template('linux-stubdom', True):
stubdom_mem = 128 # from libxl_create.c stubdom_mem = 128 # from libxl_create.c
else: else:
stubdom_mem = 28 # from libxl_create.c stubdom_mem = 28 # from libxl_create.c

9
templates/libvirt/xen.xml
View File

@ -112,12 +112,13 @@
{% if vm.hvm %} {% if vm.hvm %}
<emulator <emulator
{% if vm.features.get('linux-stubdom', False) %} {% if vm.features.check_with_template('linux-stubdom', True) %}
type="stubdom-linux" type="stubdom-linux"
{% else %} {% else %}
type="stubdom" type="stubdom"
{% endif %} {% endif %}
{% if vm.netvm and not vm.features.get('linux-stubdom', False) %} {% if vm.netvm and not
vm.features.check_with_template('linux-stubdom', True) %}
cmdline="-net lwip,client_ip={{ vm.ip -}} cmdline="-net lwip,client_ip={{ vm.ip -}}
,server_ip={{ vm.dns[1] -}} ,server_ip={{ vm.dns[1] -}}
,dns={{ vm.netvm.gateway -}} ,dns={{ vm.netvm.gateway -}}
@ -129,12 +130,12 @@
{% endif %} {% endif %}
/> />
<input type="tablet" bus="usb"/> <input type="tablet" bus="usb"/>
{% if vm.features.get('linux-stubdom', False) %} {% if vm.features.check_with_template('linux-stubdom', True) %}
<video type="cirrus"/> <video type="cirrus"/>
{% else %} {% else %}
<video type="vga"/> <video type="vga"/>
{% endif %} {% endif %}
{% if vm.features.get('linux-stubdom', False) %} {% if vm.features.check_with_template('linux-stubdom', True) %}
{# TODO only add qubes gui if gui-agent is not installed in HVM #} {# TODO only add qubes gui if gui-agent is not installed in HVM #}
<graphics type="qubes"/> <graphics type="qubes"/>
{% endif %} {% endif %}