From patchwork Wed Nov 20 02:42:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 1197784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Hngv0WlCz9sPV for ; Wed, 20 Nov 2019 14:08:11 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.b="TEwQRQFV"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47Hngt6gMLzDqxH for ; Wed, 20 Nov 2019 14:08:10 +1100 (AEDT) X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47Hn9W0ZtGzDqfY for ; Wed, 20 Nov 2019 13:45:19 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=ozlabs.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.b="TEwQRQFV"; dkim-atps=neutral Received: by ozlabs.org (Postfix, from userid 1023) id 47Hn9V66yFz9sPK; Wed, 20 Nov 2019 13:45:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1574217918; bh=rfR2YdduZtE8PFiuk2V3mZLyYnYD51/S/THjNQq1r8Q=; h=From:To:Subject:Date:In-Reply-To:References:From; b=TEwQRQFVz2RSq+ZnOJ4wmMywggt9Offv9Lof/5Ts3kJi0vRRdhtGIhrnIpQnD3KzM Z5kU0lTKUhk/RggWhlTe/Q/XqSwh84GVe3KCQTqXE7sG3d4r7u7PbzHPIxCJtfWru9 s8XaIH9ZMs4BEdlAEwDxvHSC6tpiOqT2+15It5M8edBvE9NScBdtaRFNQkChUEbXlE hMeZDLzQBofaGscIZ5fwfVWltkFv5yVxbL+ncDXxHIau4nCP8yh4VEZA7d6ja0TgpF g8YjGcax4iu+BbR2o0DnyAoOmAoZavPTMnPXTf53jvYIsxeo5h5DTFdST3/Rn/vJPn KVXoK8f1entqA== From: Jeremy Kerr To: petitboot@lists.ozlabs.org Subject: [PATCH 01/14] discover/grub2: 'search' set-variable defaults to root Date: Wed, 20 Nov 2019 10:42:53 +0800 Message-Id: <20191120024306.16526-2-jk@ozlabs.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191120024306.16526-1-jk@ozlabs.org> References: <20191120024306.16526-1-jk@ozlabs.org> MIME-Version: 1.0 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" If no --set= argument is specified, default to the variable named 'root', as per current grub docs. Signed-off-by: Jeremy Kerr --- discover/grub2/builtins.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discover/grub2/builtins.c b/discover/grub2/builtins.c index 7e92299..3f09319 100644 --- a/discover/grub2/builtins.c +++ b/discover/grub2/builtins.c @@ -113,7 +113,7 @@ static int builtin_search(struct grub2_script *script, const char *env_var, *spec; int i; - env_var = NULL; + env_var = "root"; for (i = 1; i < argc - 1; i++) { if (!strncmp(argv[i], "--set=", strlen("--set="))) { @@ -122,7 +122,7 @@ static int builtin_search(struct grub2_script *script, } } - if (!env_var) + if (!strlen(env_var)) return 0; spec = argv[argc - 1];