From owner-svn-ports-head@FreeBSD.ORG Sun Jan 18 18:04:34 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5016949; Sun, 18 Jan 2015 18:04:34 +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 781F9AE5; Sun, 18 Jan 2015 18:04:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0II4YK2065803; Sun, 18 Jan 2015 18:04:34 GMT (envelope-from kmoore@FreeBSD.org) Received: (from kmoore@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0II4Xaa065800; Sun, 18 Jan 2015 18:04:33 GMT (envelope-from kmoore@FreeBSD.org) Message-Id: <201501181804.t0II4Xaa065800@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kmoore set sender to kmoore@FreeBSD.org using -f From: Kris Moore Date: Sun, 18 Jan 2015 18:04:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377340 - 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-1 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: Sun, 18 Jan 2015 18:04:34 -0000 Author: kmoore Date: Sun Jan 18 18:04:33 2015 New Revision: 377340 URL: https://svnweb.freebsd.org/changeset/ports/377340 QAT: https://qat.redports.org/buildarchive/r377340/ Log: - Update GRUBs mkconfig scripts to disable geom gptid label until GRUB can be taught how to parse it properly. - Bump PORTREV Modified: head/sysutils/grub2-pcbsd/Makefile head/sysutils/grub2-pcbsd/files/00_header.in head/sysutils/grub2-pcbsd/files/10_ktrueos.in Modified: head/sysutils/grub2-pcbsd/Makefile ============================================================================== --- head/sysutils/grub2-pcbsd/Makefile Sun Jan 18 17:43:50 2015 (r377339) +++ head/sysutils/grub2-pcbsd/Makefile Sun Jan 18 18:04:33 2015 (r377340) @@ -3,7 +3,7 @@ PORTNAME= grub2-pcbsd PORTVERSION= 2.02p -PORTREVISION= 19 +PORTREVISION= 20 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 Sun Jan 18 17:43:50 2015 (r377339) +++ head/sysutils/grub2-pcbsd/files/00_header.in Sun Jan 18 18:04:33 2015 (r377340) @@ -32,6 +32,9 @@ export TEXTDOMAINDIR="/usr/local/share/l # Set indicator that we haven't written device access yet haveDevAccess=0 +# Work-around for systems with GPTID enabled still +echo "insmod part_gpt" + # Do this as early as possible, since other commands might depend on it. # (e.g. the `loadfont' command might need lvm or raid modules) for i in ${GRUB_PRELOAD_MODULES} ; do Modified: head/sysutils/grub2-pcbsd/files/10_ktrueos.in ============================================================================== --- head/sysutils/grub2-pcbsd/files/10_ktrueos.in Sun Jan 18 17:43:50 2015 (r377339) +++ head/sysutils/grub2-pcbsd/files/10_ktrueos.in Sun Jan 18 18:04:33 2015 (r377340) @@ -176,6 +176,9 @@ display_loaderopts() if [ "$haveGELI" = "true" ] ; then echo " set kFreeBSD.kern.geom.eli.passphrase=\"\$pass\"" fi + + # GRUB does NOT support gptid labels yet + echo " set kFreeBSD.kern.geom.label.gptid.enable=\"0\"" } detect_beadm()