In invirt-autoinstaller:

  * For Jaunty systems, edit /boot/grub/menu.lst appropriately to work
    with the fix for LP #291256.

svn path=/trunk/packages/invirt-autoinstaller/; revision=2330

diff --git a/common/usr/lib/xen-tools/debian.d/93-setup-grub b/common/usr/lib/xen-tools/debian.d/93-setup-grub
index 26fbdda..61deefb 100755 (executable)
--- a/common/usr/lib/xen-tools/debian.d/93-setup-grub
+++ b/common/usr/lib/xen-tools/debian.d/93-setup-grub
@@ -68,6 +68,13 @@ if [ "$(chroot ${prefix} lsb_release -is)" = "Ubuntu" ] && \
 fi
 
 #
 fi
 
 #

+# If this is a Jaunty machine, the fix from LP #291256 caused our
+# patch to update-grub to not work, so let's use that mechanism
+# instead
+#
+sed -i -e 's/indomU=detect/indomU=true/' /boot/grub/menu.lst
+
+#

 # Regenerate automagic kernels list
 #
 chroot ${prefix} /usr/sbin/update-grub -y
 # Regenerate automagic kernels list
 #
 chroot ${prefix} /usr/sbin/update-grub -y

diff --git a/debian/changelog b/debian/changelog
index 38ccb06..50f5f5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-autoinstaller (0.0.22) unstable; urgency=low
+
+  * For Jaunty systems, edit /boot/grub/menu.lst appropriately to work
+    with the fix for LP #291256.
+
+ -- Evan Broder <broder@mit.edu>  Sat, 02 May 2009 22:20:29 -0400
+

 invirt-autoinstaller (0.0.21) unstable; urgency=low
 
   * Create xen-tools symlinks for installing Intrepid and Jaunty.
 invirt-autoinstaller (0.0.21) unstable; urgency=low
 
   * Create xen-tools symlinks for installing Intrepid and Jaunty.