vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-mkimage.c: Document memdisk implying --prefix.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-12 21:08:53 +02:00
parent d70dbab77a
commit 8573d302fc
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimage.c: Document memdisk implying --prefix.
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/bus/usb/ehci.c (grub_ehci_fini_hw): Ignore errors, not * grub-core/bus/usb/ehci.c (grub_ehci_fini_hw): Ignore errors, not

4
util/grub-mkimage.c
View file

@ -1710,7 +1710,9 @@ static struct argp_option options[] = {
{"memdisk", 'm', N_("FILE"), 0, {"memdisk", 'm', N_("FILE"), 0,
/* TRANSLATORS: "memdisk" here isn't an identifier, it can be translated. /* TRANSLATORS: "memdisk" here isn't an identifier, it can be translated.
"embed" is a verb (command description). "*/ "embed" is a verb (command description). "*/
N_("embed FILE as a memdisk image"), 0}, N_("embed FILE as a memdisk image\n"
"Implies `-p (memdisk)/boot/grub' but prefix can be overridden by "
"later options"), 0},
/* TRANSLATORS: "embed" is a verb (command description). "*/ /* TRANSLATORS: "embed" is a verb (command description). "*/
{"config", 'c', N_("FILE"), 0, N_("embed FILE as an early config"), 0}, {"config", 'c', N_("FILE"), 0, N_("embed FILE as an early config"), 0},
/* TRANSLATORS: "embed" is a verb (command description). "*/ /* TRANSLATORS: "embed" is a verb (command description). "*/