svn commit: r377340 - in head/sysutils/grub2-pcbsd: . files
Kris Moore
kmoore at FreeBSD.org
Sun Jan 18 18:04:34 UTC 2015
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()
More information about the svn-ports-all
mailing list