Last change
on this file since 2766 was
2335,
checked in by broder, 16 years ago
|
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).
|
File size:
1.4 KB
|
Rev | Line | |
---|
[641] | 1 | --- /usr/sbin/update-grub.orig 2008-05-03 23:30:37.000000000 -0400 |
---|
| 2 | +++ /usr/sbin/update-grub 2008-05-03 23:30:55.000000000 -0400 |
---|
| 3 | @@ -911,13 +911,6 @@ |
---|
| 4 | is_xen= |
---|
| 5 | fi |
---|
| 6 | |
---|
| 7 | - if [ ! "$in_domU" ] && [ "$is_xen" ]; then |
---|
| 8 | - # skip xen kernels |
---|
| 9 | - continue |
---|
| 10 | - elif [ "$in_domU" ] && ! [ "$is_xen" ]; then |
---|
| 11 | - # skip non-xen kernels |
---|
| 12 | - continue |
---|
| 13 | - fi |
---|
| 14 | kern="/boot/$kern" |
---|
| 15 | newerKernels="" |
---|
| 16 | for i in $sortedKernels ; do |
---|
[2335] | 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 |
---|
[641] | 36 | --- /boot/grub/menu.lst.orig 2008-05-04 03:17:31.000000000 -0400 |
---|
| 37 | +++ /boot/grub/menu.lst 2008-05-04 03:19:09.000000000 -0400 |
---|
| 38 | @@ -59,7 +59,7 @@ |
---|
| 39 | ## e.g. kopt=root=/dev/hda1 ro |
---|
| 40 | ## kopt_2_6_8=root=/dev/hdc1 ro |
---|
| 41 | ## kopt_2_6_8_2_686=root=/dev/hdc2 ro |
---|
| 42 | -# kopt=root=/dev/hda1 ro |
---|
| 43 | +# kopt=root=/dev/hda1 ro console=ttyS0,9600,8n1 |
---|
| 44 | |
---|
| 45 | ## default grub root device |
---|
| 46 | ## e.g. groot=(hd0,0) |
---|
Note: See
TracBrowser
for help on using the repository browser.