grub2/0075-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch
Peter Jones 8c6b1ac71e Reconcile with upstream once again.
Also include some minor fixes for gcc 5.1.1

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 09:46:32 -04:00

40 lines
1.2 KiB
Diff

From a72fc329ebd81c03d7a2e6ad422e573e5a4d3213 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 6 Apr 2014 00:44:44 +0200
Subject: [PATCH 075/506] * grub-core/lib/syslinux_parse.c: Fix timeout
quoting.
---
ChangeLog | 4 ++++
grub-core/lib/syslinux_parse.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 094fbca..11de908 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-06 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * grub-core/lib/syslinux_parse.c: Fix timeout quoting.
+
2014-04-04 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/libgcc.h: Remove ctzsi2 and ctzdi2. They're no longer
diff --git a/grub-core/lib/syslinux_parse.c b/grub-core/lib/syslinux_parse.c
index 21fa175..6bc504b 100644
--- a/grub-core/lib/syslinux_parse.c
+++ b/grub-core/lib/syslinux_parse.c
@@ -1432,7 +1432,7 @@ config_file (struct output_buffer *outbuf,
for (curentry = menu.entries; curentry->next; curentry = curentry->next);
lentry = curentry;
- print_string ("set timeout='");
+ print_string ("set timeout=");
err = print_num (outbuf, (menu.timeout + 9) / 10);
if (err)
return err;
--
2.4.3