svn commit: r363200 - in head/sysutils/grub2-pcbsd: . files

[Kris Moore]

Author: kmoore
Date: Mon Jul 28 16:55:19 2014
New Revision: 363200
URL: http://svnweb.freebsd.org/changeset/ports/363200
QAT: https://qat.redports.org/buildarchive/r363200/

Log:
  - Fix up grub.cfg generation from install media
  - Bump PORTREV

Modified:
  head/sysutils/grub2-pcbsd/Makefile
  head/sysutils/grub2-pcbsd/files/00_header.in

Modified: head/sysutils/grub2-pcbsd/Makefile
==============================================================================
--- head/sysutils/grub2-pcbsd/Makefile	Mon Jul 28 16:53:43 2014	(r363199)
+++ head/sysutils/grub2-pcbsd/Makefile	Mon Jul 28 16:55:19 2014	(r363200)
@@ -3,7 +3,7 @@
 
 PORTNAME=	grub2-pcbsd
 PORTVERSION=	2.02p
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=   http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/

Modified: head/sysutils/grub2-pcbsd/files/00_header.in
==============================================================================
--- head/sysutils/grub2-pcbsd/files/00_header.in	Mon Jul 28 16:53:43 2014	(r363199)
+++ head/sysutils/grub2-pcbsd/files/00_header.in	Mon Jul 28 16:55:19 2014	(r363200)
@@ -38,11 +38,17 @@ for i in ${GRUB_PRELOAD_MODULES} ; do
   echo "insmod $i"
 done
 
+if [ -e "/root/beadm.install" ] ; then
+  BEADM="/root/beadm.install"
+else
+  BEADM="beadm"
+fi
+
 # If GRUB_DEFAULT is unset, lets figure out which beadm wants to use by default
 if [ "x${GRUB_DEFAULT}" = "x" ] ; then 
   GRUB_DEFAULT=0
   beCount=0
-  beadm list -H >/tmp/.grub-beadm.$$ 2>/dev/null
+  $BEADM list -H >/tmp/.grub-beadm.$$ 2>/dev/null
   while read line
   do 
     flags=`echo $line | awk '{print $2}'`
@@ -63,7 +69,7 @@ if [ "x${GRUB_TIMEOUT}" = "x" ] ; then G
 if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=auto ; fi
 
 # Check if we have more than one BE, and need to show the menu by default
-beNum=`beadm list 2>/dev/null | grep -v 'Mountpoint' | wc -l | awk '{print $1}'`
+beNum=`$BEADM list 2>/dev/null | grep -v 'Mountpoint' | wc -l | awk '{print $1}'`
 if [ $beNum -gt 1 ] ; then GRUB_HIDDEN_TIMEOUT=""; fi
 
 if [ "x${GRUB_DEFAULT_BUTTON}" = "x" ] ; then GRUB_DEFAULT_BUTTON="$GRUB_DEFAULT" ; fi