From owner-svn-src-stable-10@FreeBSD.ORG  Tue Jun  3 14:50:51 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9C942AEB;
 Tue,  3 Jun 2014 14:50:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 899EB237A;
 Tue,  3 Jun 2014 14:50:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53EopUK010920;
 Tue, 3 Jun 2014 14:50:51 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53Eoptr010919;
 Tue, 3 Jun 2014 14:50:51 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <201406031450.s53Eoptr010919@svn.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Tue, 3 Jun 2014 14:50:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r267010 - stable/10/sys/boot/forth
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jun 2014 14:50:51 -0000

Author: rodrigc
Date: Tue Jun  3 14:50:51 2014
New Revision: 267010
URL: http://svnweb.freebsd.org/changeset/base/267010

Log:
  MFC r266938:
  
  Allow customization of the brand displayed in the boot menu.
  If the user specifies in /boot/loader.conf:
  
      loader_brand="mycustom-brand"
  
  Then "mycustom-brand" will be executed instead of "fbsd-logo".
  
  Submitted by:    alfred
  Obtained from:   FreeNAS

Modified:
  stable/10/sys/boot/forth/brand.4th
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/forth/brand.4th
==============================================================================
--- stable/10/sys/boot/forth/brand.4th	Tue Jun  3 14:46:50 2014	(r267009)
+++ stable/10/sys/boot/forth/brand.4th	Tue Jun  3 14:50:51 2014	(r267010)
@@ -56,6 +56,8 @@ variable brandY
 \ 	NAME        DESCRIPTION
 \ 	fbsd        FreeBSD logo
 \ 
+\ NOTE: Setting `loader_brand' to the value of an existing function
+\       (such as "mycustom-brand") will cause that symbol to be executed.
 \ NOTE: Setting `loader_brand' to an undefined value (such as "none") will
 \       prevent any brand from being drawn.
 \ 
@@ -87,5 +89,14 @@ variable brandY
 		2drop exit
 	then
 
+        \ if it refers to a raw symbol then run that function
+        sfind if
+            brandX @ brandY @
+            2 roll
+            execute
+        else            
+            drop
+        then
+
 	2drop
 ;