Index: trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub
===================================================================
--- trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub	(revision 2174)
+++ trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub	(revision 2325)
@@ -25,7 +25,17 @@
 # linux-image-xen-{amd64,686} in debian.
 #
-installDebianPackage ${prefix} linux-image-xen-amd64
-installDebianPackage ${prefix} linux-image-xen-686
-installDebianPackage ${prefix} linux-image-xen
+
+installDebianPackage ${prefix} lsb-release
+
+if [ "$(chroot ${prefix} lsb_release -is)" = "Ubuntu" ]; then
+    if dpkg --compare-versions "$(chroot ${prefix} lsb_release -rs)" ge 8.10; then
+        installDebianPackage ${prefix} linux-image-virtual
+    else
+        installDebianPackage ${prefix} linux-image-xen
+    fi
+else
+    installDebianPackage ${prefix} linux-image-xen-amd64
+    installDebianPackage ${prefix} linux-image-xen-686
+fi
 
 installDebianPackage ${prefix} grub
@@ -49,4 +59,14 @@
 
 #
+# If this is a pv_ops kernel, then we need to make some more changes
+# to make the console work right
+#
+if [ "$(chroot ${prefix} lsb_release -is)" = "Ubuntu" ] && \
+    dpkg --compare-versions "$(chroot ${prefix} lsb_release -rs)" ge 8.10; then
+    sed -i -e 's/xvc0/hvc0/' /etc/event.d/tty1
+    sed -i -e 's/console=ttyS0[^ ]*/console=hvc0/' /boot/grub/menu.lst
+fi
+
+#
 # Regenerate automagic kernels list
 #