|
 |
f96e0b |
From 46b79bbd8c9d96174ef793a52aae90cdd58c6f07 Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Fri, 12 Apr 2013 21:08:53 +0200
|
|
|
f96e0b |
Subject: [PATCH 294/482] * util/grub-mkimage.c: Document memdisk
|
|
|
f96e0b |
implying --prefix.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 4 ++++
|
|
|
f96e0b |
util/grub-mkimage.c | 4 +++-
|
|
|
f96e0b |
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 0d5c836..92cb29d 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,9 @@
|
|
|
f96e0b |
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ * util/grub-mkimage.c: Document memdisk implying --prefix.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
* grub-core/bus/usb/ehci.c (grub_ehci_fini_hw): Ignore errors, not
|
|
|
f96e0b |
much we can do about it anyway.
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
|
|
|
f96e0b |
index dce2c29..80e7d81 100644
|
|
|
f96e0b |
--- a/util/grub-mkimage.c
|
|
|
f96e0b |
+++ b/util/grub-mkimage.c
|
|
|
f96e0b |
@@ -1710,7 +1710,9 @@ static struct argp_option options[] = {
|
|
|
f96e0b |
{"memdisk", 'm', N_("FILE"), 0,
|
|
|
f96e0b |
/* TRANSLATORS: "memdisk" here isn't an identifier, it can be translated.
|
|
|
f96e0b |
"embed" is a verb (command description). "*/
|
|
|
f96e0b |
- N_("embed FILE as a memdisk image"), 0},
|
|
|
f96e0b |
+ N_("embed FILE as a memdisk image\n"
|
|
|
f96e0b |
+ "Implies `-p (memdisk)/boot/grub' but prefix can be overridden by "
|
|
|
f96e0b |
+ "later options"), 0},
|
|
|
f96e0b |
/* TRANSLATORS: "embed" is a verb (command description). "*/
|
|
|
f96e0b |
{"config", 'c', N_("FILE"), 0, N_("embed FILE as an early config"), 0},
|
|
|
f96e0b |
/* TRANSLATORS: "embed" is a verb (command description). "*/
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|