Changeset 2335 for trunk/packages


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed

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

    r2333 r2335  
    6969
    7070#
    71 # If this is a Jaunty machine, the fix from LP #291256 caused our
    72 # patch to update-grub to not work, so let's use that mechanism
    73 # instead.
    74 #
    75 # Since we haven't run update-grub yet, we need to generate the
    76 # skeleton of a Debian menu.lst so that update-grub extracts the
    77 # options correctly
    78 #
    79 cat >/boot/grub/menu.lst <<EOF
    80 ### BEGIN AUTOMAGIC KERNELS LIST
    81 ## ## Start Default Options ##
    82 # indomU=true
    83 ## ## End Default Options ##
    84 ### END DEBIAN AUTOMAGIC KERNELS LIST
    85 EOF
    86 sed -i -e 's/indomU=detect/indomU=true/' /boot/grub/menu.lst
    87 
    88 #
    8971# Regenerate automagic kernels list
    9072#

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

    r1497 r2335  
    1515        newerKernels=""
    1616        for i in $sortedKernels ; do
     17--- /usr/sbin/update-grub.orig  2009-05-03 03:38:48.000000000 +0000
     18+++ /usr/sbin/update-grub       2009-05-03 03:39:57.000000000 +0000
     19@@ -1419,16 +1419,6 @@
     20                is_xen=
     21        fi
     22 
     23-    if [ "$indomU" = "false" ] && [ "$is_xen" ]; then
     24-        # We aren't running in a Xen domU, skip xen kernels
     25-        echo "Ignoring Xen kernel on non-Xen host: $kern"
     26-        continue
     27-    elif [ "$indomU" = "true" ] && ! [ "$is_xen" ]; then
     28-        # We are running in a Xen domU, skip non-xen kernels
     29-        echo "Ignoring non-Xen Kernel on Xen domU host: $kern"
     30-        continue
     31-    fi
     32-   
     33     kern="/boot/$kern"
     34        newerKernels=""
     35        for i in $sortedKernels ; do
    1736--- /boot/grub/menu.lst.orig    2008-05-04 03:17:31.000000000 -0400
    1837+++ /boot/grub/menu.lst 2008-05-04 03:19:09.000000000 -0400

  • trunk/packages/invirt-autoinstaller/debian/changelog

    r2333 r2335  
     1invirt-autoinstaller (0.0.24) unstable; urgency=low
     2
     3  * Add a new version of our patches to work with the current Ubuntu
     4    update-grub, instead of trying to use the indomU variable (which still
     5    excludes kernels from showing up in the menu.lst).
     6
     7 -- Evan Broder <broder@mit.edu>  Sat, 02 May 2009 23:45:03 -0400
     8
    19invirt-autoinstaller (0.0.23) unstable; urgency=low
    210
Note: See TracChangeset for help on using the changeset viewer.