From 954fd730ca029a95ca6dcee9755a6718c2ab8b7d Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 10 Feb 2016 15:43:33 -0800 Subject: [PATCH] Allow protocol to be separated from host with a semicolon 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 ea1ff7d01..e17c64a71 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -1292,6 +1292,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) {