From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1cVsJi-0002b4-Iw for mharc-grub-devel@gnu.org; Mon, 23 Jan 2017 23:02:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVsJg-0002ax-5Z for grub-devel@gnu.org; Mon, 23 Jan 2017 23:02:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVsJd-0001ug-2l for grub-devel@gnu.org; Mon, 23 Jan 2017 23:02:44 -0500 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:34782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cVsJc-0001uY-Sf for grub-devel@gnu.org; Mon, 23 Jan 2017 23:02:41 -0500 Received: by mail-lf0-x242.google.com with SMTP id q89so15600288lfi.1 for ; Mon, 23 Jan 2017 20:02:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=+EtbgsL60+sJHH9kXbeFZckMwJ0knovLobugLCaxcuU=; b=aIwt8fDFjXLcMm0GRjainahc8Jd95wnibc3+J1HRB57y0oLQSXnhmt68yTfkZavRnw 3S235tZojRYsufG8cIlc55JAbLvBGyt+261iaUVDl75rk+MYP5V+TvfXnJAkO8wFJtNF EecP4bX6DNfYcrYZdQevnQJE2hMoWcY21XNo/s5aX10feyDFGEZNnU2zAR1IExDNgolc BTVwCgN8BKN02AobzKr+K7buUfMmaSGuOrUuR7zypIbsaYsnokRixoNMqByea9zxxDEw jvtV0LrY4+EBweRyqrzH1u63XshPxYDv6W79PEb45TNxdHsD5OrTAjSKkmcjs7Xjqxsn 7VXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=+EtbgsL60+sJHH9kXbeFZckMwJ0knovLobugLCaxcuU=; b=avJ2f3C/Ji+oe31XCuWaKhEQxlzV3o9TNVjfSr/yam6LXkBGJDGoXSs6dEqYYE39c9 hbVF8HxDQj1yL8KZwgqerjQ0oqynsOVWnLAfMEZqrfPBz86dG0fqkEuHgQJpT2/Juleh sVAbeIAcO0CqHo+hdSTOlU5nX4ZQFuTgZJmlSEGAfijMv7EoRfsodZRLQ5YWrH1gDGNM naiUR0Bhwc9LXbEnk9DN7jXIzptEv6Vl4YjB5+PuowCzEp/O0rtxvelx7JNKbvy8jzXH Oe6wCDH7tkwVsc6m7ZUhRfaCd92eRMgo0jlpYXy7hTyaWRRZxxiV+XThVABR0NU8zHON oiig== X-Gm-Message-State: AIkVDXKKMEQPzVI9zfvQDX0pyFdihVJ9qbwpfboWBkwmqiw4Okjx+3LXTULegVlvfRQl+Q== X-Received: by 10.25.155.11 with SMTP id d11mr10830424lfe.110.1485230559412; Mon, 23 Jan 2017 20:02:39 -0800 (PST) Received: from [192.168.1.3] (ppp109-252-90-129.pppoe.spdop.ru. [109.252.90.129]) by smtp.gmail.com with ESMTPSA id 96sm6945744lfp.18.2017.01.23.20.02.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jan 2017 20:02:38 -0800 (PST) Subject: Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon To: The development of GNU GRUB References: <20170124003601.24612-1-mjg59@coreos.com> <20170124003601.24612-5-mjg59@coreos.com> Cc: Matthew Garrett From: Andrei Borzenkov Message-ID: <411c7ef8-85a2-afd8-7446-0fd8d3d98616@gmail.com> Date: Tue, 24 Jan 2017 07:02:38 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170124003601.24612-5-mjg59@coreos.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::242 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 04:02:45 -0000 24.01.2017 03:36, Matthew Garrett пишет: > Some DHCP servers (such as dnsmasq) tokenise parameters with commas, making > it impossible to pass boot files with commas in them. Allow using a grub_net_open() operates on devices, not files. Please give more details about your problem. > 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) > { >