| 1 |
robbat2 10/06/25 04:24:26 |
| 2 |
|
| 3 |
Modified: 840_all_grub-0.97_kvm_vda.patch ChangeLog |
| 4 |
Log: |
| 5 |
Respin KVM VDA patch to apply better. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.2 src/patchsets/grub/0.97/840_all_grub-0.97_kvm_vda.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/840_all_grub-0.97_kvm_vda.patch?rev=1.2&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/840_all_grub-0.97_kvm_vda.patch?rev=1.2&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/840_all_grub-0.97_kvm_vda.patch?r1=1.1&r2=1.2 |
| 13 |
|
| 14 |
Index: 840_all_grub-0.97_kvm_vda.patch |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/840_all_grub-0.97_kvm_vda.patch,v |
| 17 |
retrieving revision 1.1 |
| 18 |
retrieving revision 1.2 |
| 19 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
| 20 |
--- 840_all_grub-0.97_kvm_vda.patch 25 Jun 2010 04:03:41 -0000 1.1 |
| 21 |
+++ 840_all_grub-0.97_kvm_vda.patch 25 Jun 2010 04:24:26 -0000 1.2 |
| 22 |
@@ -3,26 +2,26 @@ X-Gentoo-Bug: 259613 |
| 23 |
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=259613 |
| 24 |
X-Redhat-Bug: 479760 |
| 25 |
X-Redhat-Bug-URL: https://bugzilla.redhat.com/show_bug.cgi?id=479760 |
| 26 |
-Patch: https://bugzilla.redhat.com/attachment.cgi?id=328792 |
| 27 |
+Original-Patch: https://bugzilla.redhat.com/attachment.cgi?id=328792 |
| 28 |
+ |
| 29 |
+Respun from original patch. Support KVM vd[A-Z][0-9] style disks. |
| 30 |
|
| 31 |
-diff -ur grub-0.97.orig/util/grub-install.in grub-0.97/util/grub-install.in |
| 32 |
---- grub-0.97.orig/util/grub-install.in 2009-01-12 21:47:56.000000000 -0500 |
| 33 |
-+++ grub-0.97/util/grub-install.in 2009-01-12 21:48:16.000000000 -0500 |
| 34 |
-@@ -102,7 +102,7 @@ |
| 35 |
+diff -Nuar --exclude '*.orig' --exclude '*.rej' grub-0.97.orig/util/grub-install.in grub-0.97/util/grub-install.in |
| 36 |
+--- grub-0.97.orig/util/grub-install.in 2010-06-25 04:19:17.997447837 +0000 |
| 37 |
++++ grub-0.97/util/grub-install.in 2010-06-25 04:21:29.466324286 +0000 |
| 38 |
+@@ -96,13 +96,13 @@ |
| 39 |
+ # Break the device name into the disk part and the partition part. |
| 40 |
+ case "$host_os" in |
| 41 |
linux*) |
| 42 |
- tmp_disk=`echo "$1" | grep -v '/mapper/control$' | |
| 43 |
- grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq | |
| 44 |
-- sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ |
| 45 |
-+ sed -e 's%\([shv]d[a-z]\)[0-9]*$%\1%' \ |
| 46 |
+- tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ |
| 47 |
++ tmp_disk=`echo "$1" | sed -e 's%\([shv]d[a-z]\)[0-9]*$%\1%' \ |
| 48 |
-e 's%\(d[0-9]*\)p[0-9]*$%\1%' \ |
| 49 |
-e 's%\(fd[0-9]*\)$%\1%' \ |
| 50 |
-e 's%/part[0-9]*$%/disc%' \ |
| 51 |
-@@ -112,7 +112,7 @@ |
| 52 |
- -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'` |
| 53 |
- tmp_part=`echo "$1" | grep -v '/mapper/control$' | |
| 54 |
- grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq | |
| 55 |
-- sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \ |
| 56 |
-+ sed -e 's%.*/[shv]d[a-z]\([0-9]*\)$%\1%' \ |
| 57 |
+ -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \ |
| 58 |
+ -e 's%\(e[0-9]\.[0-9]*\).*$%\1%'` |
| 59 |
+- tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \ |
| 60 |
++ tmp_part=`echo "$1" | sed -e 's%.*/[shv]d[a-z]\([0-9]*\)$%\1%' \ |
| 61 |
-e 's%.*d[0-9]*p%%' \ |
| 62 |
-e 's%.*/fd[0-9]*$%%' \ |
| 63 |
-e 's%.*/floppy/[0-9]*$%%' \ |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.8 src/patchsets/grub/0.97/ChangeLog |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/ChangeLog?rev=1.8&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/ChangeLog?rev=1.8&content-type=text/plain |
| 71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/ChangeLog?r1=1.7&r2=1.8 |
| 72 |
|
| 73 |
Index: ChangeLog |
| 74 |
=================================================================== |
| 75 |
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/ChangeLog,v |
| 76 |
retrieving revision 1.7 |
| 77 |
retrieving revision 1.8 |
| 78 |
diff -p -w -b -B -u -u -r1.7 -r1.8 |
| 79 |
--- ChangeLog 25 Jun 2010 04:08:15 -0000 1.7 |
| 80 |
+++ ChangeLog 25 Jun 2010 04:24:26 -0000 1.8 |
| 81 |
@@ -1,6 +1,10 @@ |
| 82 |
# ChangeLog for grub patchset |
| 83 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 84 |
-# $Header: /var/cvsroot/gentoo/src/patchsets/grub/0.97/ChangeLog,v 1.7 2010/06/25 04:08:15 robbat2 Exp $ |
| 85 |
+# $Header: /var/cvsroot/gentoo/src/patchsets/grub/0.97/ChangeLog,v 1.8 2010/06/25 04:24:26 robbat2 Exp $ |
| 86 |
+ |
| 87 |
+ 25 Jun 2010; Robin H. Johnson <robbat2@g.o> |
| 88 |
+ 840_all_grub-0.97_kvm_vda.patch: |
| 89 |
+ Respin KVM VDA patch to apply better. |
| 90 |
|
| 91 |
25 Jun 2010; Robin H. Johnson <robbat2@g.o> |
| 92 |
+420_all_grub-0.97-chainload-logical.patch: |
Archives