Changeset 2335 for trunk

Timestamp:

May 2, 2009, 11:46:02 PM (16 years ago)

Author:

broder

Message:

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).

Location:

trunk/packages/invirt-autoinstaller

Files:

• common/usr/lib/xen-tools/debian.d/93-setup-grub (modified) (1 diff)
• common/usr/lib/xen-tools/patches/common.diff (modified) (1 diff)
• debian/changelog (modified) (1 diff)

trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub

@@ -69 +69 @@
 
 #
-# 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
 #

trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/patches/common.diff

@@ -15 +15 @@
         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

trunk/packages/invirt-autoinstaller/debian/changelog

@@ +1 @@
+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