1 |
robbat2 10/06/25 04:08:15 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: 420_all_grub-0.97-chainload-logical.patch |
5 |
Log: |
6 |
Bug #230905: Support chainloading logical partitions. |
7 |
|
8 |
Revision Changes Path |
9 |
1.7 src/patchsets/grub/0.97/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/ChangeLog?rev=1.7&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/ChangeLog?rev=1.7&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/ChangeLog?r1=1.6&r2=1.7 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/ChangeLog,v |
18 |
retrieving revision 1.6 |
19 |
retrieving revision 1.7 |
20 |
diff -p -w -b -B -u -u -r1.6 -r1.7 |
21 |
--- ChangeLog 25 Jun 2010 04:04:22 -0000 1.6 |
22 |
+++ ChangeLog 25 Jun 2010 04:08:15 -0000 1.7 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for grub patchset |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo/src/patchsets/grub/0.97/ChangeLog,v 1.6 2010/06/25 04:04:22 robbat2 Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo/src/patchsets/grub/0.97/ChangeLog,v 1.7 2010/06/25 04:08:15 robbat2 Exp $ |
28 |
+ |
29 |
+ 25 Jun 2010; Robin H. Johnson <robbat2@g.o> |
30 |
+ +420_all_grub-0.97-chainload-logical.patch: |
31 |
+ Bug #230905: Support chainloading logical partitions. |
32 |
|
33 |
25 Jun 2010; Robin H. Johnson <robbat2@g.o> |
34 |
+410_all_grub-0.97-dhcp-vendorclass.patch: |
35 |
|
36 |
|
37 |
|
38 |
1.1 src/patchsets/grub/0.97/420_all_grub-0.97-chainload-logical.patch |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/420_all_grub-0.97-chainload-logical.patch?rev=1.1&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/grub/0.97/420_all_grub-0.97-chainload-logical.patch?rev=1.1&content-type=text/plain |
42 |
|
43 |
Index: 420_all_grub-0.97-chainload-logical.patch |
44 |
=================================================================== |
45 |
X-Gentoo-Bug: 230905 |
46 |
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=230905 |
47 |
Patch: http://bugs.gentoo.org/attachment.cgi?id=159669&action=view |
48 |
|
49 |
Support chainloading logical partitions. |
50 |
|
51 |
diff -ru grub-0.97/stage2/disk_io.c grub-0.97-patched/stage2/disk_io.c |
52 |
--- grub-0.97/stage2/disk_io.c 2004-05-23 18:35:24.000000000 +0200 |
53 |
+++ grub-0.97-patched/stage2/disk_io.c 2008-07-06 00:56:03.000000000 +0200 |
54 |
@@ -746,6 +746,8 @@ |
55 |
#ifndef STAGE1_5 |
56 |
static unsigned long cur_part_offset; |
57 |
static unsigned long cur_part_addr; |
58 |
+static unsigned long cur_part_start; |
59 |
+static int cur_part_entry; |
60 |
#endif |
61 |
|
62 |
/* Open a partition. */ |
63 |
@@ -815,6 +817,8 @@ |
64 |
|
65 |
cur_part_offset = part_offset; |
66 |
cur_part_addr = BOOT_PART_TABLE + (entry << 4); |
67 |
+ cur_part_start = part_start; |
68 |
+ cur_part_entry = entry; |
69 |
#endif /* ! STAGE1_5 */ |
70 |
|
71 |
/* If this is a valid partition... */ |
72 |
@@ -1142,6 +1146,7 @@ |
73 |
src = (char *) SCRATCHADDR + BOOTSEC_PART_OFFSET; |
74 |
while (dst < (char *) BOOT_PART_TABLE + BOOTSEC_PART_LENGTH) |
75 |
*dst++ = *src++; |
76 |
+ PC_SLICE_START (BOOT_PART_TABLE - PC_SLICE_OFFSET, cur_part_entry) = cur_part_start; |
77 |
|
78 |
/* Set the active flag of the booted partition. */ |
79 |
for (i = 0; i < 4; i++) |