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

libvirt: allow skipping hardcoded kernelopts

Browse Source 
Add 'no-default-kernelopts' feature to skip default hardcoded
Linux-specific kernelopts.
This is especially useful for non-Linux VMs (including Mirage OS).

Fixes QubesOS/qubes-issues#4468
This commit is contained in:
Marek Marczykowski-Górecki 2018-11-03 05:23:50 +01:00
parent 328697730b
commit 85a20428a6
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/libvirt/xen.xml
View File

@ -43,7 +43,11 @@
<initrd>{{ vm.storage.kernels_dir }}/initramfs</initrd> <initrd>{{ vm.storage.kernels_dir }}/initramfs</initrd>
{% endif %} {% endif %}
{% if vm.kernel %} {% if vm.kernel %}
{% if vm.features.check_with_template('no-default-kernelopts', False) -%}
<cmdline>{{ vm.kernelopts }}</cmdline>
{% else -%}
<cmdline>root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 {{ vm.kernelopts }}</cmdline> <cmdline>root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 {{ vm.kernelopts }}</cmdline>
{% endif -%}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
</os> </os>