From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 23 19:27:06 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 24D4CEC3;
 Mon, 23 Mar 2015 19:27:06 +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 0FAC2F83;
 Mon, 23 Mar 2015 19:27:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NJR5N8053885;
 Mon, 23 Mar 2015 19:27:05 GMT (envelope-from kmoore@FreeBSD.org)
Received: (from kmoore@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NJR5vG053883;
 Mon, 23 Mar 2015 19:27:05 GMT (envelope-from kmoore@FreeBSD.org)
Message-Id: <201503231927.t2NJR5vG053883@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kmoore set sender to
 kmoore@FreeBSD.org using -f
From: Kris Moore <kmoore@FreeBSD.org>
Date: Mon, 23 Mar 2015 19:27:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382032 - in head/sysutils/grub2-pcbsd: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2015 19:27:06 -0000

Author: kmoore
Date: Mon Mar 23 19:27:04 2015
New Revision: 382032
URL: https://svnweb.freebsd.org/changeset/ports/382032
QAT: https://qat.redports.org/buildarchive/r382032/

Log:
  - Add GRUB_NODUALBOOT knob to grub's defaults file
    This disables support for trying to add disks for dual-boot
  - Bump PORTREV

Modified:
  head/sysutils/grub2-pcbsd/Makefile
  head/sysutils/grub2-pcbsd/files/30_os-prober.in

Modified: head/sysutils/grub2-pcbsd/Makefile
==============================================================================
--- head/sysutils/grub2-pcbsd/Makefile	Mon Mar 23 19:24:52 2015	(r382031)
+++ head/sysutils/grub2-pcbsd/Makefile	Mon Mar 23 19:27:04 2015	(r382032)
@@ -3,7 +3,7 @@
 
 PORTNAME=	grub2-pcbsd
 PORTVERSION=	2.02p
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	sysutils
 MASTER_SITES=   http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/

Modified: head/sysutils/grub2-pcbsd/files/30_os-prober.in
==============================================================================
--- head/sysutils/grub2-pcbsd/files/30_os-prober.in	Mon Mar 23 19:24:52 2015	(r382031)
+++ head/sysutils/grub2-pcbsd/files/30_os-prober.in	Mon Mar 23 19:27:04 2015	(r382032)
@@ -58,6 +58,13 @@ menuentry "Chainload Disk (hd${hdnum} - 
 EOF
 }
 
+if [ -e "/usr/local/etc/default/grub" ] ; then
+  . /usr/local/etc/default/grub
+fi
+if [ -n "$GRUB_NODUALBOOT" ] ; then
+   exit 0
+fi
+
 # Look for file-systems on the zpool disk
 for disk in `zpool status | grep ONLINE | grep -v "state:" | awk '{print $1}'`
 do