From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 25 15:50:15 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 AC5459D9;
 Thu, 25 Dec 2014 15:50:15 +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 BB946284F;
 Thu, 25 Dec 2014 15:49:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBPFnobf076639;
 Thu, 25 Dec 2014 15:49:50 GMT (envelope-from kmoore@FreeBSD.org)
Received: (from kmoore@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBPFnoQ9076637;
 Thu, 25 Dec 2014 15:49:50 GMT (envelope-from kmoore@FreeBSD.org)
Message-Id: <201412251549.sBPFnoQ9076637@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: Thu, 25 Dec 2014 15:49:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375578 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Dec 2014 15:50:15 -0000

Author: kmoore
Date: Thu Dec 25 15:49:49 2014
New Revision: 375578
URL: https://svnweb.freebsd.org/changeset/ports/375578
QAT: https://qat.redports.org/buildarchive/r375578/

Log:
  - Fix a bug using shell built-in which command
  - Add fallback when using installer 'beadm' command
  - Bump PORTREV

Modified:
  head/sysutils/grub2-pcbsd/Makefile
  head/sysutils/grub2-pcbsd/files/10_ktrueos.in

Modified: head/sysutils/grub2-pcbsd/Makefile
==============================================================================
--- head/sysutils/grub2-pcbsd/Makefile	Thu Dec 25 14:56:45 2014	(r375577)
+++ head/sysutils/grub2-pcbsd/Makefile	Thu Dec 25 15:49:49 2014	(r375578)
@@ -3,7 +3,7 @@
 
 PORTNAME=	grub2-pcbsd
 PORTVERSION=	2.02p
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	sysutils
 MASTER_SITES=   http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/

Modified: head/sysutils/grub2-pcbsd/files/10_ktrueos.in
==============================================================================
--- head/sysutils/grub2-pcbsd/files/10_ktrueos.in	Thu Dec 25 14:56:45 2014	(r375577)
+++ head/sysutils/grub2-pcbsd/files/10_ktrueos.in	Thu Dec 25 15:49:49 2014	(r375578)
@@ -180,14 +180,21 @@ display_loaderopts()
 
 detect_beadm()
 {
-   which -s beadm
+   /usr/bin/which -s beadm >/dev/null 2>/dev/null
    if [ $? -ne 0 ] ; then return 0; fi
 
    # Check if we are running from the installer and use its beadm
    if [ -e "/root/beadm.install" ] ; then
       BEADM="/root/beadm.install"
+
+      # Check if this is valid
+      testBE=`$BEADM list`
+      if [ -z "$testBE" ] ; then
+        # No BE's, lets switch back to regular mode
+        BEADM="`/usr/bin/which beadm`"
+      fi
    else
-      BEADM="`which beadm`"
+      BEADM="`/usr/bin/which beadm`"
    fi
 
    ${BEADM} list >/dev/null 2>/dev/null