From owner-svn-src-all@FreeBSD.ORG Mon Jan 9 15:38:55 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 132B1106566B; Mon, 9 Jan 2012 15:38:55 +0000 (UTC) (envelope-from Devin.Teske@fisglobal.com) Received: from mx1.fisglobal.com (mx1.fisglobal.com [199.200.24.190]) by mx1.freebsd.org (Postfix) with ESMTP id C7A0E8FC14; Mon, 9 Jan 2012 15:38:54 +0000 (UTC) Received: from pps.filterd (ltcfislmsgpa03 [127.0.0.1]) by ltcfislmsgpa03.fnfis.com (8.14.4/8.14.4) with SMTP id q09FQerV027481; Mon, 9 Jan 2012 09:38:53 -0600 Received: from smtp.fisglobal.com ([10.132.206.16]) by ltcfislmsgpa03.fnfis.com with ESMTP id 1282hgr562-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Mon, 09 Jan 2012 09:38:53 -0600 Received: from [10.0.0.105] (10.14.152.28) by smtp.fisglobal.com (10.132.206.16) with Microsoft SMTP Server (TLS) id 14.1.323.3; Mon, 9 Jan 2012 09:38:50 -0600 References: <201112300624.pBU6OxO9098906@svn.freebsd.org> <4F08A518.8090207@FreeBSD.org> <4F0AE274.8010907@FreeBSD.org> In-Reply-To: <4F0AE274.8010907@FreeBSD.org> MIME-Version: 1.0 (iPhone Mail 8C148) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="us-ascii" Message-ID: X-Mailer: iPhone Mail (8C148) From: Devin Teske Date: Mon, 9 Jan 2012 07:38:39 -0800 To: Dimitry Andric X-Originating-IP: [10.14.152.28] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110, 1.0.211, 0.0.0000 definitions=2012-01-09_03:2012-01-09, 2012-01-09, 1970-01-01 signatures=0 Cc: "" , "" , Sergey Kandaurov , "" 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 15:38:55 -0000 On Jan 9, 2012, at 4:49 AM, Dimitry Andric wrote: > On 2012-01-08 21:35, Sergey Kandaurov wrote: > ... >> So, the problem arise when beastie_disable is set. >>=20 >> 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 catch >> as seen with the code in head. >> Otherwise, when beastie is enabled, all works as it should. >>=20 >> To "fix" the problem I replaced 'catch' with 'sfind', so that we can >> conditionally call menu-unset only when the definition is present. >>=20 >> Please try the following patch. I tested it with enabled/disabled beastie >> and loader_color over serial console. I would also like to get a review >> from Devin Teske to see if this change is acceptable. >=20 > Yes, this patch makes the warning disappear. Thanks! Please also see additional notes in PR kern/163938 (additional patching to = same file for same problem). --=20 Devin _____________ The information contained in this message is proprietary and/or confidentia= l. If you are not the intended recipient, please: (i) delete the message an= d all copies; (ii) do not disclose, distribute or use the message in any ma= nner; and (iii) notify the sender immediately. In addition, please be aware= that any message addressed to our domain is subject to archiving and revie= w by persons other than the intended recipient. Thank you.