From owner-svn-ports-head@FreeBSD.ORG Mon Jul 28 16:55:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D278DBF; Mon, 28 Jul 2014 16:55:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A5C362450; Mon, 28 Jul 2014 16:55:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6SGtKZm068387; Mon, 28 Jul 2014 16:55:20 GMT (envelope-from kmoore@svn.freebsd.org) Received: (from kmoore@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6SGtKoO068385; Mon, 28 Jul 2014 16:55:20 GMT (envelope-from kmoore@svn.freebsd.org) Message-Id: <201407281655.s6SGtKoO068385@svn.freebsd.org> From: Kris Moore Date: Mon, 28 Jul 2014 16:55:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363200 - in head/sysutils/grub2-pcbsd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jul 2014 16:55:20 -0000 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