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

Fix grub-probe -0 option 

* util/grub-probe,c (options): Make -0 work again (broken by
conversion to argp).
(main): Simplify logic.
This commit is contained in:
Colin Watson 2014-03-31 13:51:17 +01:00
parent 46b74dd3cb
commit 9b35fe819f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2014-03-31 Colin Watson <cjwatson@ubuntu.com>
* util/grub-probe,c (options): Make -0 work again (broken by
conversion to argp).
(main): Simplify logic.
2014-03-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/relocator.c: Fix the case when end of leftover is used.

7
util/grub-probe.c
View File

@ -711,6 +711,7 @@ static struct argp_option options[] = {
N_("use FILE as the device map [default=%s]"), 0},
{"target", 't', N_("TARGET"), 0, 0, 0},
{"verbose", 'v', 0, 0, N_("print verbose messages."), 0},
{0, '0', 0, 0, N_("separate items in output using ASCII NUL characters"), 0},
{ 0, 0, 0, 0, 0, 0 }
};
@ -884,11 +885,7 @@ main (int argc, char *argv[])
else
probe (arguments.devices[0], NULL, delim);
if (!arguments.zero_delim && (print == PRINT_BIOS_HINT
|| print == PRINT_IEEE1275_HINT
|| print == PRINT_BAREMETAL_HINT
|| print == PRINT_EFI_HINT
|| print == PRINT_ARC_HINT))
if (delim == ' ')
putchar ('\n');
/* Free resources. */