From: Matthew Garrett <mjg59@coreos.com>
To: grub-devel@gnu.org
Cc: Matthew Garrett <mjg59@coreos.com>
Subject: [PATCH 4/4] Allow protocol to be separated from host with a semicolon
Date: Mon, 23 Jan 2017 15:45:08 -0800 [thread overview]
Message-ID: <20170123234508.22527-4-mjg59@coreos.com> (raw)
In-Reply-To: <20170123234508.22527-1-mjg59@coreos.com>
Some DHCP servers (such as dnsmasq) tokenise parameters with commas, making
it impossible to pass boot files with commas in them. Allow using a
semicolon to separate the protocol from host if a comma wasn't found.
---
grub-core/net/net.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 585f4f7..efacb30 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1280,6 +1280,10 @@ grub_net_open_real (const char *name)
const char *comma;
char *colon;
comma = grub_strchr (name, ',');
+ if (!comma)
+ {
+ comma = grub_strchr (name, ';');
+ }
colon = grub_strchr (name, ':');
if (colon)
{
--
2.9.3
next prev parent reply other threads:[~2017-01-24 9:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-23 23:45 [PATCH 1/4] Allow non-default ports for HTTP requests Matthew Garrett
2017-01-23 23:45 ` [PATCH 2/4] Send a user class identifier in bootp requests and tag it as DHCP discover Matthew Garrett
2017-01-23 23:45 ` [PATCH 3/4] Don't allocate a new address buffer if we receive multiple DNS responses Matthew Garrett
2017-01-23 23:45 ` Matthew Garrett [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-01-24 0:35 Misc network boot patches Matthew Garrett
2017-01-24 0:36 ` [PATCH 4/4] Allow protocol to be separated from host with a semicolon Matthew Garrett
2017-01-24 4:02 ` Andrei Borzenkov
2017-01-24 20:50 ` Matthew Garrett
2017-01-25 3:48 ` Andrei Borzenkov
2017-01-25 4:06 ` Matthew Garrett
2017-01-25 4:15 ` Andrei Borzenkov
2017-01-25 4:25 ` Matthew Garrett
2017-01-25 6:56 ` Andrei Borzenkov
2017-01-25 7:16 ` Matthew Garrett
2017-01-25 7:37 ` Andrei Borzenkov
2017-01-25 9:00 ` Matthew Garrett
2017-01-25 6:18 ` Michael Chang
2017-01-25 6:21 ` Matthew Garrett
2017-01-25 8:35 ` Michael Chang
2017-01-25 9:02 ` Matthew Garrett
2017-01-25 17:30 ` Andrei Borzenkov
2017-01-25 23:33 ` Matthew Garrett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170123234508.22527-4-mjg59@coreos.com \
--to=mjg59@coreos.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.