Index: head/sysutils/grub2-pcbsd/Makefile
===================================================================
--- head/sysutils/grub2-pcbsd/Makefile	(revision 396515)
+++ head/sysutils/grub2-pcbsd/Makefile	(revision 396516)
@@ -1,98 +1,98 @@
 # Created by: kmoore@FreeBSD.org
 # $FreeBSD$
 
 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
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
 		help2man:${PORTSDIR}/misc/help2man
 
 WRKSRC=		${WRKDIR}/grub-2.02
 CONFLICTS=	grub-0* grub2-2*
 SSP_UNSAFE=	yes
 USE_GCC=	yes
 ACLOCAL_ARGS=	-Im4
 GNU_CONFIGURE=	yes
 USES=		autoreconf bison cpe gettext gmake makeinfo python tar:xz
 ONLY_FOR_ARCHS=	i386 amd64
 INFO=		grub grub-dev
 MAKE_JOBS_UNSAFE=	yes
 
 CPE_PRODUCT=	grub
 CPE_VENDOR=	gnu
 
 CONFIGURE_ARGS=	--disable-werror --localedir=${PREFIX}/share/locale
 CONFIGURE_ENV=	CPP="${CC} -E" \
 		LEX=${LOCALBASE}/bin/flex
 
 SUB_FILES=	00_header 10_kfreebsd 10_ktrueos 30_os-prober 50_otherbe
 
 OPTIONS_DEFINE=	MKFONT FUSE
 OPTIONS_DEFAULT=MKFONT
 MKFONT_DESC=	Build grub-mkfont (require freetype2)
 FUSE_DESC=	Build grub-mount (require FUSE)
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "amd64"
 EFIEMU=		"@comment "
 .endif
 
 PLIST_SUB+=	EFIEMU=${EFIEMU}
 
 .if ${PORT_OPTIONS:MMKFONT}
 LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
 		${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 MAN1+=		grub-mkfont.1
 CONFIGURE_ARGS+=	--enable-grub-mkfont
 .else
 CONFIGURE_ARGS+=	--disable-grub-mkfont
 MKFONT=		"@comment "
 .endif
 
 PLIST_SUB+=	MKFONT=${MKFONT}
 
 .if ${PORT_OPTIONS:MFUSE}
 LIB_DEPENDS+=	libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
 CONFIGURE_ARGS+=	--enable-grub-mount
 .else
 CONFIGURE_ARGS+=	--disable-grub-mount
 FUSE=		"@comment "
 .endif
 
 PLIST_SUB+=	FUSE=${FUSE}
 
 post-patch:
 	@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' ${WRKSRC}/autogen.sh
 	cd ${WRKSRC} && ./autogen.sh
 
 post-configure:
 	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
 
 post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/lib/charset.alias
 	${INSTALL_SCRIPT} ${WRKDIR}/00_header ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/10_kfreebsd ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/10_ktrueos ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/30_os-prober ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/50_otherbe ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${MV} ${STAGEDIR}${PREFIX}/etc/grub.d/40_custom ${STAGEDIR}/${PREFIX}/etc/grub.d/40_custom.dist
 
 RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
 
 .include <bsd.port.post.mk>
Index: head/sysutils/grub2-pcbsd/distinfo
===================================================================
--- head/sysutils/grub2-pcbsd/distinfo	(revision 396515)
+++ head/sysutils/grub2-pcbsd/distinfo	(revision 396516)
@@ -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
Index: head/sysutils/grub2-pcbsd/files/10_ktrueos.in
===================================================================
--- head/sysutils/grub2-pcbsd/files/10_ktrueos.in	(revision 396515)
+++ head/sysutils/grub2-pcbsd/files/10_ktrueos.in	(revision 396516)
@@ -1,389 +1,389 @@
 #!/bin/sh
 #
 # Copyright 2015 iXsystems (Kris Moore)
 # All rights reserved
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted providing that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Script to detect TrueOS / PC-BSD disk installations and create grub
 # entries for them
 
 # Check if we have beadm installed, if not skip this file
 if [ ! -e "/usr/local/sbin/beadm" ] ; then exit 0; fi
 
 ROOTFS=`mount | awk '/ \/ / {print $1}'`
 BEDS="$( echo ${ROOTFS} | awk -F '/' '{print $2}' )"
 if [ "$BEDS" = "dev" ] ; then BEDS="ROOT"; fi
 
 serial=0;
 console=0;
 for x in ${GRUB_TERMINAL_OUTPUT}; do
     if [ xserial = "x$x" ]; then
         serial=1;
     fi
     if [ xgfxterm = "x$x" ]; then
         console=1;
     fi
     if [ xconsole = "x$x" ]; then
         console=1;
     fi
 done
 
 if [ "x$serial" = "x1" ]; then
     if [ "x$console" = "x1" ]; then
         out="-Dh"
     else
         out="-h"
     fi
 fi
 
 display_loaderopts()
 {
   # Optional ARG1, set to a ZFS dataset to mount and read values from
   if [ -n "$1" ] ; then
      fMnt="/mnt.$$"
      mkdir $fMnt
      mount -t zfs  ${1} $fMnt >/dev/null 
      if [ $? -ne 0 ] ; then
         echo "Failed to mount ${1}" >&2
         return
      fi
   else
      fMnt=""
   fi
   
   # Create our placeholder to save _load entries to parse
   touch /tmp/.lRObjs.$$
   touch /tmp/.lSysCtls.$$
 
   # Loader files, in order of which to read them
   lFiles="${fMnt}/boot/loader.conf.local ${fMnt}/boot/loader.conf ${fMnt}/boot/loader.conf.trueos ${fMnt}/boot/loader.conf.pcbsd"
   for f in $lFiles
   do
      if [ ! -e "$f" ] ; then continue ; fi
 
      # Lets parse any of the _load= lines
      grep "_load=" ${f} | grep -v "^#" >/tmp/.lObjs.$$
      while read line
      do
        loadVal="`echo $line | cut -d '=' -f 1`"
        # Is this value already set in a higher priority file?
        grep -q "^${loadVal}" /tmp/.lRObjs.$$
        if [ $? -eq 0 ];then continue; fi
 
        # Save this value for later
        echo "$line" >> /tmp/.lRObjs.$$
        haveObjs=1
 
      done < /tmp/.lObjs.$$
      rm /tmp/.lObjs.$$
 
      # Lets look for any sysctls to set
      grep "." ${f} | grep "=" | grep -v "^#" | grep -v "_load" >/tmp/.sObjs.$$
      while read line
      do
        loadVal="`echo $line | cut -d '=' -f 1`"
        # Is this value already set in a higher priority file?
        grep -q "^${loadVal}" /tmp/.lSysCtls.$$
        if [ $? -eq 0 ];then continue; fi
 
        # Save this value for later
        echo "$line" >> /tmp/.lSysCtls.$$
        haveSysCtls=1
 
      done < /tmp/.sObjs.$$
      rm /tmp/.sObjs.$$
   done
 
   # Using GELI encryption?
   haveGELI="false"
 
   # Now lets echo out the modules to load
   if [ "$haveObjs" = "1" ] ; then
     while read line
     do
       echo "$line" | grep -q '"YES"'
       if [ $? -ne 0 ] ; then continue ; fi
       module="`echo $line | cut -d '=' -f 1 | sed 's|_load||g'`"
       # Try to locate module now
       if [ -e "${fMnt}/boot/kernel/${module}.ko" ] ; then
         mPath="kernel"
       elif [ -e "${fMnt}/boot/modules/${module}.ko" ] ; then
         mPath="modules"
       else
 	# This isn't a module that we can see, lets set it as a variable
 	#echo "No such module $line, setting as a variable" >&2
         echo "$line" >> /tmp/.lSysCtls.$$
         continue
       fi
 
       # Are we loading GELI module?
       if [ "$module" = "geom_eli" ] ; then haveGELI="true" ; fi
 
       echo "    kfreebsd_module_elf ${loadPrefix}/@/boot/${mPath}/${module}.ko"
     done < /tmp/.lRObjs.$$
   fi
 
   # Add our compat kenv lines
   echo "    set kFreeBSD.bootfile=\"kernel\""
   echo "    set kFreeBSD.kernel=\"kernel\""
   echo "    set kFreeBSD.kernel_options=\"\""
   echo "    set kFreeBSD.kernelname=\"/boot/kernel/kernel\""
   echo "    set kFreeBSD.module_path=\"/boot/kernel;/boot/modules\""
 
   # Any kenv to set?
   if [ "$haveSysCtls" = "1" ] ; then
     while read line
     do
       # Strip out the vfs.root.mountfrom, we set that elsewhere
       echo "$line" | grep -q "vfs.root.mountfrom"
       if [ $? -eq 0 ] ; then continue ; fi
 
       line="`echo $line | sed 's|"||g'`"
       key="`echo $line | cut -d '=' -f 1`"
       val="`echo $line | cut -d '=' -f 2`"
       if [ -z "$key" -o -z "$val" ] ; then continue ; fi
       echo "    set kFreeBSD.${key}=\"${val}\""
     done < /tmp/.lSysCtls.$$
   fi
 
   rm /tmp/.lRObjs.$$
   rm /tmp/.lSysCtls.$$
   if [ -n "$1" ] ; then
      umount /mnt.$$ >/dev/null
      rmdir /mnt.$$ >/dev/null
   fi
 
   # Set the grub.platform kenv variable
   echo "    set kFreeBSD.grub.platform=\"\$grub_platform\""
 
   # See if we need to do GELI passphrase passthrough
   if [ "$haveGELI" = "true" ] ; then
     echo "    set kFreeBSD.kern.geom.eli.passphrase=\"\$pass\""
   fi
 }
 
 detect_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="`/usr/bin/which beadm`"
    fi
 
    ${BEADM} list >/dev/null 2>/dev/null
    if [ $? -ne 0 ] ; then return 0; fi
 
 
    if [ -e "/etc/defaults/pcbsd" ] ; then
       NICK="PC-BSD"
    else
       NICK="TrueOS"
    fi
 
    # Only list the default BE here
    $BEADM list -H >/tmp/.grub-beadm.$$ 2>/dev/null
    while read line
    do
      be=`echo $line | awk '{print $1}'`
      flags=`echo $line | awk '{print $2}'`
 
      # Is this BE marked as wanting to be used for next boot? Make it the first one if so
      if [ "$flags" = "NR" -o "$flags" = "R" ] ; then
         BE_LIST="$be"
         break
      fi
    done < /tmp/.grub-beadm.$$
    rm /tmp/.grub-beadm.$$
 
    # Get list of beadm datasets
    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}'`
       ztank=`echo $cdataset | cut -d '/' -f 1`
       shortdataset="/`echo $cdataset | cut -d '/' -f 2-5`"
       # Get the BE nickname if it exists
       beNickName=`${BEADM} list | grep "^${b} " | tr -s ' ' | cut -d ' ' -f 7-12`
       if [ -z "$beNickName" ] ; then
          beNickName="$b"
       fi
 
       # First part of this dataset
       cat > /tmp/.grubdataset.$$.1 << EOF
     insmod zfs
     search --no-floppy -s -l $ztank
 EOF
 
       # Second part of loader to save
       cat > /tmp/.grubdataset.$$.2 << EOF
     kfreebsd_module ${shortdataset}/@/boot/zfs/zpool.cache type=/boot/zfs/zpool.cache
     set kFreeBSD.vfs.root.mountfrom=zfs:$cdataset
 EOF
       
       # Now lets look for options in loader.conf to load
       loadPrefix="${shortdataset}"
       # If this is the current mounted dataset, we can skip mounting it
       mount | grep -q -e "$cdataset on / (" -e "$cdataset on /mnt ("
       if [ $? -eq 0 ] ; then
         display_loaderopts >>/tmp/.grubdataset.$$.2
       else
         display_loaderopts $cdataset >> /tmp/.grubdataset.$$.2
       fi
 
       # Lets start a submenu for each BE
 cat << EOF
 
 submenu "${NICK} (${beNickName}) - ${cdatadate} ${cdatatime}" {
 EOF
   
   # Lets do the default entry first
   #################################
   cat << EOF
   menuentry "Normal Bootup" {
 EOF
   # Get the dataset guts
   cat /tmp/.grubdataset.$$.1
   echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
   echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
   cat /tmp/.grubdataset.$$.2
 
   # Set any options
   cat << EOF
   }
 EOF
 
   # Next lets do single user mode
   #################################
   cat << EOF
   menuentry "Single User Mode" {
 EOF
   # Get the dataset guts
   cat /tmp/.grubdataset.$$.1
   echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out} -s"
   echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
   cat /tmp/.grubdataset.$$.2
 
   # Set any options
   cat << EOF
   }
 EOF
 
   # Next lets do verbose mode
   #################################
   cat << EOF
   menuentry "Verbose Mode" {
 EOF
   # Get the dataset guts
   cat /tmp/.grubdataset.$$.1
   echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out} -v"
   echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
   cat /tmp/.grubdataset.$$.2
 
   # Set any options
   cat << EOF
   }
 EOF
 
   if [ -e "/etc/defaults/pcbsd" ] ; then
     # Next lets do display wizard
     #################################
     cat << EOF
   menuentry "Run the Display Wizard" {
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
     echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
     # Set any options
     cat << EOF
     set kFreeBSD.runwiz=YES
   }
 EOF
     # Now for vesa mode
     #################################
     cat << EOF
   menuentry "Run X in vesa mode" {
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
     echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
     # Set any options
     cat << EOF
     set kFreeBSD.xvesa=YES
   }
 EOF
     # Now for non-xorg mode
     #################################
     cat << EOF
   menuentry "Boot to console (Disable X)" {
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
     echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
     # Set any options
     cat << EOF
     set kFreeBSD.noxorg=YES
   }
 EOF
   fi
 
 
       # Lastly lets close the submenu section
       cat << EOF
 }
 
 EOF
    done
 
    # Cleanup after ourselves
    if [ -e "/tmp/.grubdataset.$$.1" ] ; then
      rm /tmp/.grubdataset.$$.1
      rm /tmp/.grubdataset.$$.2
    fi
 }
 
 # Detect our types of disk layouts
 detect_beadm
 
Index: head/sysutils/grub2-pcbsd/files/30_os-prober.in
===================================================================
--- head/sysutils/grub2-pcbsd/files/30_os-prober.in	(revision 396515)
+++ head/sysutils/grub2-pcbsd/files/30_os-prober.in	(revision 396516)
@@ -1,141 +1,140 @@
 #!/bin/sh
 #
 # Copyright 2015 iXsystems (Kris Moore)
 # All rights reserved
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted providing that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 # 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
    fi
 
    cat << EOF
 menuentry "Microsoft Windows ($disk)" {
    search --no-floppy --fs-uuid --set=root $fs_uuid
    chainloader +1
 }
 EOF
 }
 
 print_uefichain() {
     cat << EOF
 menuentry "Chainload Disk (hd${hdnum} - $1)" {
    set root=('hd${hdnum},${rootpre}1')
    chainloader $1
 }
 
 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
   disk="`echo $disk | sed 's|.eli||g'`"
   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
 
   for ldisk in `cd /dev/ && ls ${parentdisk}s[0-9] ${parentdisk}p[0-99] 2>/dev/null`
   do
     fs_type=`grub-probe --device /dev/${ldisk} --target=fs 2>/dev/null`
     case $fs_type in
      ntfs) check_ntfs_part "$ldisk" ;; # Start checking for NTFS
         *) ;; # Unknown for now, add more!
     esac
   done
 done
 
 # Look for other disks to chainload
 hdnum=0
 for disk in `cd /dev/ && ls ada[0-9] da[0-9] 2>/dev/null`
 do
   # Skip disks apart of zpool
   zpool status | grep ONLINE | grep -v "state:" | grep -q "$disk"
   if [ $? -eq 0 ] ; then
     hdnum=`expr $hdnum + 1`
     continue
   fi
 
   # Check if the first partition on this disk is EFI
   if [ -e "/dev/${disk}s1" ] ; then
     fp="/dev/${disk}s1"
     rootpre=""
   else
     fp="/dev/${disk}p1"
     rootpre="gpt"
   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.$$"
     if [ ! -d "$uefimnt" ] ; then mkdir $uefimnt; fi
     mount_msdosfs $fp $uefimnt
     if [ $? -eq 0 ] ; then
        if [ -e "${uefimnt}/EFI/Boot/bootx64.efi" ] ; then
 	 print_uefichain "/EFI/Boot/bootx64.efi"
        fi
        cd $uefimnt
        for i in `find . | grep \.efi$ | grep -v "./EFI/Boot/bootx64.efi"`
        do
 	 i="`echo $i | sed 's|\./|/|g'`"
 	 print_uefichain "$i"
        done
        cd /dev
        umount $uefimnt
        rmdir $uefimnt
     fi
 
   else
     # Add BIOS chainloader
     cat << EOF
 menuentry "Chainload Disk (hd${hdnum})" {
    set root=(hd${hdnum})
    chainloader +1
 }
 EOF
   fi
   hdnum=`expr $hdnum + 1`
 done