source: trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/patches/common.diff @ 2776

/usr/sbin/update-grub

@@ -911 +911 @@
                 is_xen=
         fi
 
-        if [ ! "$in_domU" ] && [ "$is_xen" ]; then
-          # skip xen kernels
-          continue
-        elif [ "$in_domU" ] && ! [ "$is_xen" ]; then
-          # skip non-xen kernels
-          continue
-        fi
         kern="/boot/$kern"
         newerKernels=""
         for i in $sortedKernels ; do

/usr/sbin/update-grub

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

@@ -59 +59 @@
 ## e.g. kopt=root=/dev/hda1 ro
 ##      kopt_2_6_8=root=/dev/hdc1 ro
 ##      kopt_2_6_8_2_686=root=/dev/hdc2 ro
-# kopt=root=/dev/hda1 ro
+# kopt=root=/dev/hda1 ro console=ttyS0,9600,8n1
 
 ## default grub root device
 ## e.g. groot=(hd0,0)