Date: Wed, 9 Sep 2015 15:18:50 +0000 (UTC) From: Kris Moore <kmoore@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396516 - in head/sysutils/grub2-pcbsd: . files Message-ID: <201509091518.t89FIoJ8050705@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmoore Date: Wed Sep 9 15:18:49 2015 New Revision: 396516 URL: https://svnweb.freebsd.org/changeset/ports/396516 Log: - 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 Modified: head/sysutils/grub2-pcbsd/Makefile head/sysutils/grub2-pcbsd/distinfo head/sysutils/grub2-pcbsd/files/10_ktrueos.in head/sysutils/grub2-pcbsd/files/30_os-prober.in Modified: head/sysutils/grub2-pcbsd/Makefile ============================================================================== --- head/sysutils/grub2-pcbsd/Makefile Wed Sep 9 14:58:07 2015 (r396515) +++ head/sysutils/grub2-pcbsd/Makefile Wed Sep 9 15:18:49 2015 (r396516) @@ -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 Modified: head/sysutils/grub2-pcbsd/distinfo ============================================================================== --- head/sysutils/grub2-pcbsd/distinfo Wed Sep 9 14:58:07 2015 (r396515) +++ head/sysutils/grub2-pcbsd/distinfo Wed Sep 9 15:18:49 2015 (r396516) @@ -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 Modified: head/sysutils/grub2-pcbsd/files/10_ktrueos.in ============================================================================== --- head/sysutils/grub2-pcbsd/files/10_ktrueos.in Wed Sep 9 14:58:07 2015 (r396515) +++ head/sysutils/grub2-pcbsd/files/10_ktrueos.in Wed Sep 9 15:18:49 2015 (r396516) @@ -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}'` Modified: head/sysutils/grub2-pcbsd/files/30_os-prober.in ============================================================================== --- head/sysutils/grub2-pcbsd/files/30_os-prober.in Wed Sep 9 14:58:07 2015 (r396515) +++ head/sysutils/grub2-pcbsd/files/30_os-prober.in Wed Sep 9 15:18:49 2015 (r396516) @@ -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.$$"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509091518.t89FIoJ8050705>