- Bring up to speed with version in PC-BSD

- Update to later GRUB -devel from upstream
- Don't build BE menu if 'beadm' not installed
- Fix a bug matching BE names properly instead of subset

4 files changed, 11 insertions, 12 deletions

diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index c460b611c547..be5bf041de31 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	grub2-pcbsd
 PORTVERSION=	2.02q
-PORTREVISION=	4
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/
-DISTNAME=	grub-2.02_7
+DISTNAME=	grub-2.02_8
 
 MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	Multiboot boot loader
diff --git a/sysutils/grub2-pcbsd/distinfo b/sysutils/grub2-pcbsd/distinfo
index 718a5b0d1c35..0c9f358feb2d 100644
--- a/sysutils/grub2-pcbsd/distinfo
+++ b/sysutils/grub2-pcbsd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grub-2.02_7.tar.xz) = 044588d9754142f2982478cb4e7289ab1521fd4412b2a0804ce647c3ff73feff
-SIZE (grub-2.02_7.tar.xz) = 5019120
+SHA256 (grub-2.02_8.tar.xz) = 3b5382f3b2aa467dbfa1a0d53f97e24ccc1b24cdea67056fd3227c57f4c69088
+SIZE (grub-2.02_8.tar.xz) = 5022808
diff --git a/sysutils/grub2-pcbsd/files/10_ktrueos.in b/sysutils/grub2-pcbsd/files/10_ktrueos.in
index cb19146261be..15410ac18d8a 100644
--- a/sysutils/grub2-pcbsd/files/10_ktrueos.in
+++ b/sysutils/grub2-pcbsd/files/10_ktrueos.in
@@ -230,7 +230,7 @@ detect_beadm()
    for b in $BE_LIST
    do 
       # Got a beadm snapshot, lets get the complete dataset name
-      beLine=`${BEADM} list -a | grep "/$BEDS/${b}"`
+      beLine=`${BEADM} list -a | grep "/$BEDS/${b}[[:space:]]"`
       cdataset=`echo $beLine | awk '{print $1}'`
       cdatadate=`echo $beLine | awk '{print $5}'`
       cdatatime=`echo $beLine | awk '{print $6}'`
diff --git a/sysutils/grub2-pcbsd/files/30_os-prober.in b/sysutils/grub2-pcbsd/files/30_os-prober.in
index 61146c63874d..4a58fdecd57f 100644
--- a/sysutils/grub2-pcbsd/files/30_os-prober.in
+++ b/sysutils/grub2-pcbsd/files/30_os-prober.in
@@ -24,17 +24,16 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+# Check if we have beadm installed, if not skip this file
+if [ ! -e "/usr/local/sbin/beadm" ] ; then exit 0; fi
+
 # Script to detect other NON BSD OS's and add to grub.cfg
 
 check_ntfs_part()
 {
    local disk="$1"
-   fs_label=`grub-probe --device /dev/${disk} --target=fs_label`
-
-   # Check for common windows NTFS labels for bootable partitions
-   if [ "$fs_label" != "System Reserved" -a "$fs_label" != "SYSTEM RESERVED" -a "$fs_label" != "eMachines" -a "$fs_label" != "OS" -a "$fs_label" != "SYSTEM" -a "$fs_label" != "SYSTEM_DRV" ] ; then return; fi
 
-   fs_uuid=`grub-probe --device /dev/${disk} --target=fs_uuid`
+   fs_uuid=`grub-probe --device /dev/${disk} --target=fs_uuid 2>/dev/null`
    if [ -z "$fs_uuid" ] ; then
       echo "Warning: Could not get fs_uuid for $disk"
       return
@@ -72,7 +71,7 @@ do
   if [ ! -e "/dev/$disk" ] ; then continue ; fi
 
   # Get the parent disk name
-  parentdisk=`grub-probe --target=disk --device /dev/$disk`
+  parentdisk=`grub-probe --target=disk --device /dev/$disk 2>/dev/null`
   parentdisk="`echo $parentdisk | sed 's|/dev/||g'`"
   if [ ! -e "/dev/$parentdisk" ] ; then continue ; fi
 
@@ -107,7 +106,7 @@ do
   fi
 
   # Add UEFI chainloader
-  if [ "`grub-probe --device -t fs $fp`" = "fat" ] ; then
+  if [ "`grub-probe --device -t fs $fp 2>/dev/null`" = "fat" ] ; then
 
     # Lets mount the FAT partition and look for UEFI boots
     uefimnt="/tmp/.grub-uefi.$$"