Date: Fri, 7 Nov 2014 15:30:29 +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: r372276 - in head/sysutils/grub2-pcbsd: . files Message-ID: <201411071530.sA7FUTo8092959@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmoore Date: Fri Nov 7 15:30:28 2014 New Revision: 372276 URL: https://svnweb.freebsd.org/changeset/ports/372276 QAT: https://qat.redports.org/buildarchive/r372276/ Log: - Add patch to support GRUB boot using serial output, passing this setting to FreeBSD kernel - Bump PORTREV Modified: head/sysutils/grub2-pcbsd/Makefile head/sysutils/grub2-pcbsd/files/10_ktrueos.in Modified: head/sysutils/grub2-pcbsd/Makefile ============================================================================== --- head/sysutils/grub2-pcbsd/Makefile Fri Nov 7 15:29:50 2014 (r372275) +++ head/sysutils/grub2-pcbsd/Makefile Fri Nov 7 15:30:28 2014 (r372276) @@ -3,7 +3,7 @@ PORTNAME= grub2-pcbsd PORTVERSION= 2.02p -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ Modified: head/sysutils/grub2-pcbsd/files/10_ktrueos.in ============================================================================== --- head/sysutils/grub2-pcbsd/files/10_ktrueos.in Fri Nov 7 15:29:50 2014 (r372275) +++ head/sysutils/grub2-pcbsd/files/10_ktrueos.in Fri Nov 7 15:30:28 2014 (r372276) @@ -31,6 +31,26 @@ ROOTFS=`mount | awk '/ \/ / {print $1}'` BEDS="$( echo ${ROOTFS} | awk -F '/' '{print $2}' )" if [ "$BEDS" = "dev" ] ; then BEDS="ROOT"; fi +serial=0; +console=0; +for x in ${GRUB_TERMINAL_OUTPUT}; do + if [ xserial = "x$x" ]; then + serial=1; + fi + if [ xgfxterm = "x$x" ]; then + console=1; + fi + if [ xconsole = "x$x" ]; then + console=1; + fi +done +if [ "x$serial" = "x1" ]; then + if [ "x$console" = "x1" ]; then + out="-Dh" + else + out="-h" + fi +fi display_loaderopts() { @@ -216,7 +236,7 @@ EOF EOF # Get the dataset guts cat /tmp/.grubdataset.$$.1 - echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel" + echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}" echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints" cat /tmp/.grubdataset.$$.2 @@ -232,7 +252,7 @@ EOF EOF # Get the dataset guts cat /tmp/.grubdataset.$$.1 - echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel -s" + echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out} -s" echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints" cat /tmp/.grubdataset.$$.2 @@ -248,7 +268,7 @@ EOF EOF # Get the dataset guts cat /tmp/.grubdataset.$$.1 - echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel -v" + echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out} -v" echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints" cat /tmp/.grubdataset.$$.2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411071530.sA7FUTo8092959>