- Fix a bug using shell built-in which command

- Add fallback when using installer 'beadm' command
- Bump PORTREV

2 files changed, 10 insertions, 3 deletions

diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index 4cdf88874881..d555aad5377e 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -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/
diff --git a/sysutils/grub2-pcbsd/files/10_ktrueos.in b/sysutils/grub2-pcbsd/files/10_ktrueos.in
index b3bdfcfc9d09..8f275d1f9be7 100644
--- a/sysutils/grub2-pcbsd/files/10_ktrueos.in
+++ b/sysutils/grub2-pcbsd/files/10_ktrueos.in
@@ -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