From owner-svn-src-all@FreeBSD.ORG  Mon Jan  9 20:25:14 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 C4F10106566B;
	Mon,  9 Jan 2012 20:25:14 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B41028FC0C;
	Mon,  9 Jan 2012 20:25:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q09KPE2N057380;
	Mon, 9 Jan 2012 20:25:14 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q09KPEG6057378;
	Mon, 9 Jan 2012 20:25:14 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201201092025.q09KPEG6057378@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Mon, 9 Jan 2012 20:25:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229881 - 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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2012 20:25:14 -0000

Author: pluknet
Date: Mon Jan  9 20:25:14 2012
New Revision: 229881
URL: http://svn.freebsd.org/changeset/base/229881

Log:
  Get rid of a spurious warning on the console when booting the kernel
  from the interactive loader(8) prompt and beastie_disable="YES" is set
  in loader.conf(5). In this case menu.rc is not evaluated and consequently
  menu-unset does not have a body yet. This results in the ficl warning
  "menu-unset not found" when try-menu-unset invokes menu-unset.
  
  Check for beastie_disable="YES" explicitly, so that the try-menu-unset
  word will not attempt to invoke menu-unset because the menu will have
  never been configured. [1]
  Use the sfind primitive as a last resort as an additional safer approach
  conjuring a foreign word safely. [2]
  
  PR:		kern/163938
  Submitted by:	Devin Teske [1]
  Reviewed by:	Devin Teske [2]
  Reported and tested by:	dim
  MFC after:	1 week
  X-MFC with:	r228985

Modified:
  head/sys/boot/forth/loader.4th

Modified: head/sys/boot/forth/loader.4th
==============================================================================
--- head/sys/boot/forth/loader.4th	Mon Jan  9 20:16:06 2012	(r229880)
+++ head/sys/boot/forth/loader.4th	Mon Jan  9 20:25:14 2012	(r229881)
@@ -44,9 +44,20 @@ include /boot/support.4th
 only forth also support-functions also builtins definitions
 
 : try-menu-unset
+  \ menu-unset may not be present
+  s" beastie_disable" getenv
+  dup -1 <> if
+    s" YES" compare-insensitive 0= if
+      exit
+    then
+  else
+    drop
+  then
   s" menu-unset"
-  ['] evaluate catch if
-    2drop
+  sfind if
+    execute
+  else
+    drop
   then
 ;