浏览代码

linux-stubdom: Set cmdline in HVM config

HW42 6 年之前
父节点
当前提交
c695f3268c
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      qubes/tests/vm/qubesvm.py
  2. 1 1
      templates/libvirt/xen.xml

+ 1 - 0
qubes/tests/vm/qubesvm.py

@@ -579,6 +579,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             <boot dev="cdrom" />
             <boot dev="hd" />
             <!-- server_ip is the address of stubdomain. It hosts it's own DNS server. -->
+            <cmdline>root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 nopat</cmdline>
         </os>
         <features>
             <pae/>

+ 1 - 1
templates/libvirt/xen.xml

@@ -42,8 +42,8 @@
                 {% endif %}
                 <kernel>{{ vm.storage.kernels_dir }}/vmlinuz</kernel>
                 <initrd>{{ vm.storage.kernels_dir }}/initramfs</initrd>
-                <cmdline>root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 {{ vm.kernelopts }}</cmdline>
             {% endif %}
+            <cmdline>root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH rd.plymouth.enable=0 plymouth.enable=0 {{ vm.kernelopts }}</cmdline>
         {% endblock %}
     </os>