From be692f1eb06d2cd719dc301c82378e45d8bf358f Mon Sep 17 00:00:00 2001
From: Evan Broder <broder@mit.edu>
Date: Sat, 2 May 2009 23:46:02 -0400
Subject: [PATCH] In invirt-autoinstaller:   * Add a new version of our
 patches to work with the current Ubuntu     update-grub,
 instead of trying to use the indomU variable (which still  
   excludes kernels from showing up in the menu.lst).

svn path=/trunk/packages/invirt-autoinstaller/; revision=2335
---
 common/usr/lib/xen-tools/debian.d/93-setup-grub |   18 ------------------
 common/usr/lib/xen-tools/patches/common.diff    |   19 +++++++++++++++++++
 debian/changelog                                |    8 ++++++++
 3 files changed, 27 insertions(+), 18 deletions(-)

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 ce54ad6..26fbdda 100755
--- a/common/usr/lib/xen-tools/debian.d/93-setup-grub
+++ b/common/usr/lib/xen-tools/debian.d/93-setup-grub
@@ -68,24 +68,6 @@ if [ "$(chroot ${prefix} lsb_release -is)" = "Ubuntu" ] && \
 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.
-#
-# Since we haven't run update-grub yet, we need to generate the
-# skeleton of a Debian menu.lst so that update-grub extracts the
-# options correctly
-#
-cat >/boot/grub/menu.lst <<EOF
-### BEGIN AUTOMAGIC KERNELS LIST
-## ## Start Default Options ##
-# indomU=true
-## ## End Default Options ##
-### END DEBIAN AUTOMAGIC KERNELS LIST
-EOF
-sed -i -e 's/indomU=detect/indomU=true/' /boot/grub/menu.lst
-
-#
 # Regenerate automagic kernels list
 #
 chroot ${prefix} /usr/sbin/update-grub -y
diff --git a/common/usr/lib/xen-tools/patches/common.diff b/common/usr/lib/xen-tools/patches/common.diff
index 2f58ce0..1db32a5 100644
--- a/common/usr/lib/xen-tools/patches/common.diff
+++ b/common/usr/lib/xen-tools/patches/common.diff
@@ -14,6 +14,25 @@
          kern="/boot/$kern"
  	newerKernels=""
  	for i in $sortedKernels ; do
+--- /usr/sbin/update-grub.orig	2009-05-03 03:38:48.000000000 +0000
++++ /usr/sbin/update-grub	2009-05-03 03:39:57.000000000 +0000
+@@ -1419,16 +1419,6 @@
+ 		is_xen=
+ 	fi
+ 
+-    if [ "$indomU" = "false" ] && [ "$is_xen" ]; then
+-        # We aren't running in a Xen domU, skip xen kernels
+-        echo "Ignoring Xen kernel on non-Xen host: $kern"
+-        continue
+-    elif [ "$indomU" = "true" ] && ! [ "$is_xen" ]; then
+-        # We are running in a Xen domU, skip non-xen kernels
+-        echo "Ignoring non-Xen Kernel on Xen domU host: $kern"
+-        continue
+-    fi
+-    
+     kern="/boot/$kern"
+ 	newerKernels=""
+ 	for i in $sortedKernels ; do
 --- /boot/grub/menu.lst.orig	2008-05-04 03:17:31.000000000 -0400
 +++ /boot/grub/menu.lst	2008-05-04 03:19:09.000000000 -0400
 @@ -59,7 +59,7 @@
diff --git a/debian/changelog b/debian/changelog
index 45401ed..492fbc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+invirt-autoinstaller (0.0.24) unstable; urgency=low
+
+  * Add a new version of our patches to work with the current Ubuntu
+    update-grub, instead of trying to use the indomU variable (which still
+    excludes kernels from showing up in the menu.lst).
+
+ -- Evan Broder <broder@mit.edu>  Sat, 02 May 2009 23:45:03 -0400
+
 invirt-autoinstaller (0.0.23) unstable; urgency=low
 
   * Create the shell of a menu.lst file needed to successfully parse
-- 
1.7.9.5