|
 |
a5bd9f6 |
From b8ba23b222923c7f1d03c5b3b061938860ca7441 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Sun, 21 Apr 2013 13:06:22 +0200
|
|
|
a5bd9f6 |
Subject: [PATCH 333/364] * grub-core/disk/arc/arcdisk.c
|
|
|
a5bd9f6 |
(grub_arcdisk_iterate_iter): Fix a type which prevented CD-ROM and floppy
|
|
|
a5bd9f6 |
boot.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
grub-core/disk/arc/arcdisk.c | 2 +-
|
|
|
a5bd9f6 |
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index 6be583e..2150d3d 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,5 +1,10 @@
|
|
|
a5bd9f6 |
2013-04-21 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
+ * grub-core/disk/arc/arcdisk.c (grub_arcdisk_iterate_iter):
|
|
|
a5bd9f6 |
+ Fix a type which prevented CD-ROM and floppy boot.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+2013-04-21 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
Support coreboot framebuffer.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* grub-core/video/i386/coreboot/cbfb.c: New file.
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/arc/arcdisk.c b/grub-core/disk/arc/arcdisk.c
|
|
|
a5bd9f6 |
index 5d12128..780728f 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/arc/arcdisk.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/arc/arcdisk.c
|
|
|
a5bd9f6 |
@@ -95,7 +95,7 @@ grub_arcdisk_iterate_iter (const char *name,
|
|
|
a5bd9f6 |
struct grub_arcdisk_iterate_ctx *ctx = data;
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
if (!(comp->type == GRUB_ARC_COMPONENT_TYPE_DISK
|
|
|
a5bd9f6 |
- || comp->type == GRUB_ARC_COMPONENT_TYPE_DISK
|
|
|
a5bd9f6 |
+ || comp->type == GRUB_ARC_COMPONENT_TYPE_FLOPPY
|
|
|
a5bd9f6 |
|| comp->type == GRUB_ARC_COMPONENT_TYPE_TAPE))
|
|
|
a5bd9f6 |
return 0;
|
|
|
a5bd9f6 |
return ctx->hook (name, ctx->hook_data);
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|