diff --git a/vm_conf_files/appvm-template.conf b/vm_conf_files/appvm-template.conf index 4cb996b..3752ef4 100644 --- a/vm_conf_files/appvm-template.conf +++ b/vm_conf_files/appvm-template.conf @@ -4,7 +4,7 @@ kernel="%TEMPLATEDIR%/kernels/vmlinuz" ramdisk="%TEMPLATEDIR%/kernels/initramfs" -extra="ro nomodeset rd_NO_PLYMOUTH 3" +extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3" root="/dev/mapper/dmroot" memory = 400 diff --git a/vm_conf_files/netvm.conf b/vm_conf_files/netvm.conf index 5022c3a..cac110d 100644 --- a/vm_conf_files/netvm.conf +++ b/vm_conf_files/netvm.conf @@ -4,7 +4,7 @@ kernel="/var/lib/qubes/servicevms/%NETVMNAME%/kernels/vmlinuz" ramdisk="/var/lib/qubes/servicevms/%NETVMNAME%/kernels/initramfs" -extra="ro nomodeset rd_NO_PLYMOUTH 3 pci=nomsi" +extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3 pci=nomsi" root="/dev/mapper/dmroot" memory = 200 diff --git a/vm_conf_files/templatevm.conf b/vm_conf_files/templatevm.conf index 00b9b65..05ec30d 100644 --- a/vm_conf_files/templatevm.conf +++ b/vm_conf_files/templatevm.conf @@ -4,7 +4,7 @@ kernel="/var/lib/qubes/vm-templates/%TEMPLATENAME%/kernels/vmlinuz" ramdisk="/var/lib/qubes/vm-templates/%TEMPLATENAME%/kernels/initramfs" -extra="ro nomodeset rd_NO_PLYMOUTH 3" +extra="ro nomodeset xencons=hvc rd_NO_PLYMOUTH 3" root="/dev/mapper/dmroot" memory = 400 diff --git a/vm_initramfs_patches/qubes_cow_setup.sh b/vm_initramfs_patches/qubes_cow_setup.sh index eae1d86..0944da9 100755 --- a/vm_initramfs_patches/qubes_cow_setup.sh +++ b/vm_initramfs_patches/qubes_cow_setup.sh @@ -9,7 +9,7 @@ if [ -e /dev/mapper/dmroot ] ; then die "Qubes: FATAL error: /dev/mapper/dmroot already exists?!" fi -modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block Frontend..." +modprobe xenblk || modprobe xen-blkfront || echo "Qubes: Cannot load Xen Block Frontend..." echo "Waiting for /dev/xvda* devices..." while ! [ -e /dev/xvda ]; do sleep 0.1; done