Blame SOURCES/0069-Fix-grub-probe-0-option.patch

f731ee
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
f731ee
From: Colin Watson <cjwatson@ubuntu.com>
f731ee
Date: Mon, 31 Mar 2014 13:51:17 +0100
f731ee
Subject: [PATCH] Fix grub-probe -0 option
f731ee
f731ee
* util/grub-probe,c (options): Make -0 work again (broken by
f731ee
conversion to argp).
f731ee
(main): Simplify logic.
f731ee
---
f731ee
 util/grub-probe.c | 7 ++-----
f731ee
 ChangeLog         | 6 ++++++
f731ee
 2 files changed, 8 insertions(+), 5 deletions(-)
f731ee
f731ee
diff --git a/util/grub-probe.c b/util/grub-probe.c
f731ee
index 1f3b59f05b9..80509be8aa7 100644
f731ee
--- a/util/grub-probe.c
f731ee
+++ b/util/grub-probe.c
f731ee
@@ -711,6 +711,7 @@ static struct argp_option options[] = {
f731ee
    N_("use FILE as the device map [default=%s]"), 0},
f731ee
   {"target",  't', N_("TARGET"), 0, 0, 0},
f731ee
   {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
f731ee
+  {0, '0', 0, 0, N_("separate items in output using ASCII NUL characters"), 0},
f731ee
   { 0, 0, 0, 0, 0, 0 }
f731ee
 };
f731ee
 
f731ee
@@ -884,11 +885,7 @@ main (int argc, char *argv[])
f731ee
   else
f731ee
     probe (arguments.devices[0], NULL, delim);
f731ee
 
f731ee
-  if (!arguments.zero_delim && (print == PRINT_BIOS_HINT
f731ee
-				|| print == PRINT_IEEE1275_HINT
f731ee
-				|| print == PRINT_BAREMETAL_HINT
f731ee
-				|| print == PRINT_EFI_HINT
f731ee
-				|| print == PRINT_ARC_HINT))
f731ee
+  if (delim == ' ')
f731ee
     putchar ('\n');
f731ee
 
f731ee
   /* Free resources.  */
f731ee
diff --git a/ChangeLog b/ChangeLog
f731ee
index 9404edab8e1..efbed8ccbf6 100644
f731ee
--- a/ChangeLog
f731ee
+++ b/ChangeLog
f731ee
@@ -1,3 +1,9 @@
f731ee
+2014-03-31  Colin Watson  <cjwatson@ubuntu.com>
f731ee
+
f731ee
+	* util/grub-probe,c (options): Make -0 work again (broken by
f731ee
+	conversion to argp).
f731ee
+	(main): Simplify logic.
f731ee
+
f731ee
 2014-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
f731ee
 
f731ee
 	* grub-core/lib/relocator.c: Fix the case when end of leftover is used.