From owner-svn-src-all@FreeBSD.ORG Mon Jan 9 20:31:12 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA202106568D; Mon, 9 Jan 2012 20:31:12 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-tul01m020-f182.google.com (mail-tul01m020-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 65CD38FC12; Mon, 9 Jan 2012 20:31:12 +0000 (UTC) Received: by obbwd18 with SMTP id wd18so6274649obb.13 for ; Mon, 09 Jan 2012 12:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=uST1lWGfC0pq1DlLmN0bcBd9dgCHjIwF+c93A3SyQiw=; b=DArQ1C842jV1YERbW9TQwvUvHgo5HU9hCW0yvCYBUDHsf23cNwRL0OmqUX9653mnTR A4n3eARiBtn6xU75Ro23IDX9yr1f52KFU8ZfkGkz8JACBjekf7R0l8Q4o2eVXiSj80Qf //9P5VSn3Rx7X8JbVSYvQoIqFd6Wd6ixKImes= MIME-Version: 1.0 Received: by 10.182.226.6 with SMTP id ro6mr15812838obc.3.1326141071761; Mon, 09 Jan 2012 12:31:11 -0800 (PST) Sender: pluknet@gmail.com Received: by 10.182.171.67 with HTTP; Mon, 9 Jan 2012 12:31:11 -0800 (PST) In-Reply-To: <4F0AE274.8010907@FreeBSD.org> References: <201112300624.pBU6OxO9098906@svn.freebsd.org> <4F08A518.8090207@FreeBSD.org> <4F0AE274.8010907@FreeBSD.org> Date: Mon, 9 Jan 2012 23:31:11 +0300 X-Google-Sender-Auth: snnJsg6LcoVZ1QvtlO9hn-agXeI Message-ID: From: Sergey Kandaurov To: Dimitry Andric Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Devin Teske Subject: Re: svn commit: r228985 - head/sys/boot/forth X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2012 20:31:12 -0000 On 9 January 2012 16:49, Dimitry Andric wrote: > On 2012-01-08 21:35, Sergey Kandaurov wrote: > ... > >> So, the problem arise when beastie_disable is set. >> >> In this case menu.rc is not evaluated and consequently menu-unset does >> not have a body yet. This results in the ficl warning "not found" when >> try-menu-unset calls menu-unset. The warning cannot be handled with catc= h >> as seen with the code in head. >> Otherwise, when beastie is enabled, all works as it should. >> >> To "fix" the problem I replaced 'catch' with 'sfind', so that we can >> conditionally call menu-unset only when the definition is present. >> >> Please try the following patch. I tested it with enabled/disabled beasti= e >> and loader_color over serial console. I would also like to get a review >> from Devin Teske to see if this change is acceptable. > > > Yes, this patch makes the warning disappear. =A0Thanks! FYI, committed in r229881. Thanks for the help. --=20 wbr, pluknet