In invirt-autoinstaller:

[invirt/packages/invirt-autoinstaller.git] / common / usr / lib / xen-tools / patches / common.diff

diff --git a/common/usr/lib/xen-tools/patches/common.diff b/common/usr/lib/xen-tools/patches/common.diff
index 2f58ce0..1db32a5 100644 (file)
--- 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 @@