From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1cVp6C-0002kk-7a for mharc-grub-devel@gnu.org; Mon, 23 Jan 2017 19:36:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVp69-0002g7-0q for grub-devel@gnu.org; Mon, 23 Jan 2017 19:36:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVp68-00013H-9I for grub-devel@gnu.org; Mon, 23 Jan 2017 19:36:33 -0500 Received: from cavan.codon.org.uk ([2a00:1098:0:80:1000:c:0:1]:56375) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cVp68-00012l-38 for grub-devel@gnu.org; Mon, 23 Jan 2017 19:36:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codon.org.uk; s=63138784; h=Subject:References:In-Reply-To:Message-Id:Date:Cc:To:From; bh=ZOZCuz7mxZoiMi2Q36lWQmlTdqihBZgSmwAteEjx+Qk=; b=Rqk4z5/GwK/WwfUAlUeC/+9x1dMV9G7Ptomp38/wap7wSR7vA5gIeMGeSVMwlGb3mQACH3ituRn53JFDq74TBwGy10+DiCIhTIgqTO3gvKxc+nnnN9Ph52l6a85DfTNkJLMUV+Hbc2JWhuBUpTbHvmcRoQKr10NsXe9CoeMIAGY=; Received: from [2603:3024:1c06:3af3:3252:cbff:fee6:e579] (helo=xps13-mjg59.libcore.so) by cavan.codon.org.uk with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1cVp62-0002Sb-Oa; Tue, 24 Jan 2017 00:36:28 +0000 From: Matthew Garrett To: grub-devel@gnu.org Cc: Matthew Garrett Date: Mon, 23 Jan 2017 16:36:01 -0800 Message-Id: <20170124003601.24612-5-mjg59@coreos.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170124003601.24612-1-mjg59@coreos.com> References: <20170124003601.24612-1-mjg59@coreos.com> X-SA-Do-Not-Run: Yes X-SA-Exim-Connect-IP: 2603:3024:1c06:3af3:3252:cbff:fee6:e579 X-SA-Exim-Mail-From: mjg59@codon.org.uk Subject: [PATCH 4/4] Allow protocol to be separated from host with a semicolon X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:54:46 +0000) X-SA-Exim-Scanned: Yes (on cavan.codon.org.uk) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2a00:1098:0:80:1000:c:0:1 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2017 00:36:34 -0000 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