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