Cc: Peter Jones pjones@redhat.com
On 06/06/2014 09:59 AM, Junxiao Bi wrote:
When using the following command to add an initrd for the kernel. grubby --update-kernel=/boot/vmlinuz-2.6.32-431.17.1.el6.x86_64.debug --initrd /boot/initramfs-2.6.32-431.17.1.el6.x86_64.debug.img --add-multiboot=/boot/tboot.gz The multiboot image /boot/tboot.gz is used as the key to search the configure entry in grub.conf, this is wrong. There may be other kernels also configure multiboot with the same name tboot.gz, if their index are smaller than the target one, then that will make the initrd added to the wrong kernel. Fix it to use kernel name as the search key.
Signed-off-by: Junxiao Bi junxiao.bi@oracle.com
grubby.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grubby.c b/grubby.c index 88a1f08..2d7ab62 100644 --- a/grubby.c +++ b/grubby.c @@ -3309,7 +3309,7 @@ int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
if (!image) return 0;
- for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {
- for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) { kernelLine = getLineByType(LT_MBMODULE, entry->lines); if (!kernelLine) continue;
On Tue, Jun 17, 2014 at 09:47:22AM +0800, Junxiao Bi wrote:
Cc: Peter Jones pjones@redhat.com
These three patches all look, upon visual inspection, to be fine. Before we can merge them, we'll need 2 things:
1) they all need to be proceeded with test cases that fail before applying the patch and succeed afterwards 2) I'll need you to send them as actual "git format-patch" output, not quoted text.
Thanks.
On 06/17/2014 10:53 PM, Peter Jones wrote:
On Tue, Jun 17, 2014 at 09:47:22AM +0800, Junxiao Bi wrote:
Cc: Peter Jones pjones@redhat.com
These three patches all look, upon visual inspection, to be fine. Before we can merge them, we'll need 2 things:
- they all need to be proceeded with test cases that fail before
applying the patch and succeed afterwards 2) I'll need you to send them as actual "git format-patch" output, not quoted text.
Thank you for looking at it. I will provide you the test result in patch.
Thanks, Junxiao.
Thanks.
On 06/17/2014 10:53 PM, Peter Jones wrote:
On Tue, Jun 17, 2014 at 09:47:22AM +0800, Junxiao Bi wrote:
Cc: Peter Jones pjones@redhat.com
These three patches all look, upon visual inspection, to be fine. Before we can merge them, we'll need 2 things:
- they all need to be proceeded with test cases that fail before
applying the patch and succeed afterwards 2) I'll need you to send them as actual "git format-patch" output, not quoted text.
Peter, double confirm of this, do you need me create test cases for the three patches, or just need the grub.conf diff before and after applying the patch?
Thanks.
On Thu, Jun 19, 2014 at 03:03:26PM +0800, Junxiao Bi wrote:
On 06/17/2014 10:53 PM, Peter Jones wrote:
On Tue, Jun 17, 2014 at 09:47:22AM +0800, Junxiao Bi wrote:
Cc: Peter Jones pjones@redhat.com
These three patches all look, upon visual inspection, to be fine. Before we can merge them, we'll need 2 things:
- they all need to be proceeded with test cases that fail before
applying the patch and succeed afterwards 2) I'll need you to send them as actual "git format-patch" output, not quoted text.
Peter, double confirm of this, do you need me create test cases for the three patches, or just need the grub.conf diff before and after applying the patch?
Any patches to grubby need to include patches to make "make test" check those changes.
anaconda-devel@lists.fedoraproject.org
-
Junxiao Bi -
Peter Jones