|
 |
a5bd9f6 |
From d064a7c4f3cc8a5faba4d4bc4f4ba82677c7b1d7 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Sat, 5 Jan 2013 15:10:46 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 084/364] * grub-core/disk/diskfilter.c
|
|
|
a5bd9f6 |
(grub_diskfilter_write): Call grub_error properly. *
|
|
|
a5bd9f6 |
grub-core/disk/ieee1275/nand.c (grub_nand_write): Likewise. *
|
|
|
a5bd9f6 |
grub-core/disk/loopback.c (grub_loopback_write): Likewise.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 7 +++++++
|
|
|
a5bd9f6 |
grub-core/disk/diskfilter.c | 3 ++-
|
|
|
a5bd9f6 |
grub-core/disk/ieee1275/nand.c | 3 ++-
|
|
|
a5bd9f6 |
grub-core/disk/loopback.c | 3 ++-
|
|
|
a5bd9f6 |
4 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index a28a1f7..f15e098 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,10 @@
|
|
|
a5bd9f6 |
+2013-01-05 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * grub-core/disk/diskfilter.c (grub_diskfilter_write): Call
|
|
|
a5bd9f6 |
+ grub_error properly.
|
|
|
a5bd9f6 |
+ * grub-core/disk/ieee1275/nand.c (grub_nand_write): Likewise.
|
|
|
a5bd9f6 |
+ * grub-core/disk/loopback.c (grub_loopback_write): Likewise.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2013-01-03 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* util/grub.d/10_kfreebsd.in: Correct the patch to zpool.cache as it's
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
|
|
|
a5bd9f6 |
index ce4c706..4117b20 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/diskfilter.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/diskfilter.c
|
|
|
a5bd9f6 |
@@ -831,7 +831,8 @@ grub_diskfilter_write (grub_disk_t disk __attribute ((unused)),
|
|
|
a5bd9f6 |
grub_size_t size __attribute ((unused)),
|
|
|
a5bd9f6 |
const char *buf __attribute ((unused)))
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
- return GRUB_ERR_NOT_IMPLEMENTED_YET;
|
|
|
a5bd9f6 |
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
|
a5bd9f6 |
+ "diskfilter writes are not supported");
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
struct grub_diskfilter_vg *
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/ieee1275/nand.c b/grub-core/disk/ieee1275/nand.c
|
|
|
a5bd9f6 |
index ad30852..3474b3e 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/ieee1275/nand.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/ieee1275/nand.c
|
|
|
a5bd9f6 |
@@ -203,7 +203,8 @@ grub_nand_write (grub_disk_t disk __attribute ((unused)),
|
|
|
a5bd9f6 |
grub_size_t size __attribute ((unused)),
|
|
|
a5bd9f6 |
const char *buf __attribute ((unused)))
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
- return GRUB_ERR_NOT_IMPLEMENTED_YET;
|
|
|
a5bd9f6 |
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
|
a5bd9f6 |
+ "nand write is not supported");
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
static struct grub_disk_dev grub_nand_dev =
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
|
|
|
a5bd9f6 |
index f3b19ef..fffd1bb 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/loopback.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/loopback.c
|
|
|
a5bd9f6 |
@@ -206,7 +206,8 @@ grub_loopback_write (grub_disk_t disk __attribute ((unused)),
|
|
|
a5bd9f6 |
grub_size_t size __attribute ((unused)),
|
|
|
a5bd9f6 |
const char *buf __attribute ((unused)))
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
- return GRUB_ERR_NOT_IMPLEMENTED_YET;
|
|
|
a5bd9f6 |
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
|
|
a5bd9f6 |
+ "loopback write is not supported");
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
static struct grub_disk_dev grub_loopback_dev =
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|