Ubuntu: install linux-image-virtual instead of linux-image-server

By default install linux-image-virtual instead of linux-image-server
on Ubuntu Intrepid and newer.

Hopefully closes: #640099, LP #839492

diff --git a/debian/changelog b/debian/changelog
index ce7eeccb1bf70a5170822618671bd93e13b0be48..d4769f4aab091fa5d7d88c543f836c695ec3041c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
     - Adds default mount options for ext4, identical to ext2/ext3.
     - Ships /etc/initramfs-tools/conf.d/xen-tools for generating Dom0
       initrds also suitable for DomU usage. Trigger update-initramfs.
+    - By default install linux-image-virtual instead of linux-image-server
+      on Ubuntu Intrepid and newer (Hopefully closes: #640099, LP #839492)
   * Add debian/gbp.conf to be able to to build xen-tools with
     git-buildpackage.
   * Clean up debian/rules:

diff --git a/hooks/intrepid/80-install-kernel b/hooks/intrepid/80-install-kernel
index 307807a55fa14aef289d288e7408c3f50395ba49..4ca7adef4ed7f742a96a0b8923a52b3ef7bb7009 100755 (executable)
--- a/hooks/intrepid/80-install-kernel
+++ b/hooks/intrepid/80-install-kernel
@@ -33,7 +33,7 @@ if [ ${pygrub} ]; then
 # Attempt to install a xen kernel, if that fails, then install a normal one
 #
 
-KERNEL_PKG="linux-image-server"
+KERNEL_PKG="linux-image-virtual"
 
 logMessage Attempting to install the $KERNEL_PKG kernel image
 logMessage WARNING: This kernel may not have pvops