Skip to content

Commit

Permalink
libvirt: allow skipping hardcoded kernelopts
Browse files Browse the repository at this point in the history
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
  • Loading branch information
marmarek committed Nov 15, 2018
1 parent 3286977 commit 85a2042
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions templates/libvirt/xen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@
<initrd>{{ vm.storage.kernels_dir }}/initramfs</initrd>
{% endif %}
{% 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>
{% endif -%}
{% endif %}
{% endblock %}
</os>
Expand Down

0 comments on commit 85a2042

Please sign in to comment.