From owner-svn-ports-head@FreeBSD.ORG Wed Nov 12 17:48: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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21DB8BCB; Wed, 12 Nov 2014 17:48: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 03157FF7; Wed, 12 Nov 2014 17:48: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 sACHmJ2n099485; Wed, 12 Nov 2014 17:48:19 GMT (envelope-from kmoore@FreeBSD.org) Received: (from kmoore@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sACHmJVm099483; Wed, 12 Nov 2014 17:48:19 GMT (envelope-from kmoore@FreeBSD.org) Message-Id: <201411121748.sACHmJVm099483@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kmoore set sender to kmoore@FreeBSD.org using -f From: Kris Moore Date: Wed, 12 Nov 2014 17:48:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372498 - 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: Wed, 12 Nov 2014 17:48:20 -0000 Author: kmoore Date: Wed Nov 12 17:48:18 2014 New Revision: 372498 URL: https://svnweb.freebsd.org/changeset/ports/372498 QAT: https://qat.redports.org/buildarchive/r372498/ Log: - Fix an issue setting kenv values in grub.cfg with ; or " in the string - Add some default kenv values to match /boot/defaults/loader.conf - 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 Wed Nov 12 15:37:37 2014 (r372497) +++ head/sysutils/grub2-pcbsd/Makefile Wed Nov 12 17:48:18 2014 (r372498) @@ -3,7 +3,7 @@ PORTNAME= grub2-pcbsd PORTVERSION= 2.02p -PORTREVISION= 11 +PORTREVISION= 12 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 Wed Nov 12 15:37:37 2014 (r372497) +++ head/sysutils/grub2-pcbsd/files/10_ktrueos.in Wed Nov 12 17:48:18 2014 (r372498) @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2013 iXsystems (Kris Moore) +# Copyright 2014 iXsystems (Kris Moore) # All rights reserved # # Redistribution and use in source and binary forms, with or without @@ -139,7 +139,14 @@ display_loaderopts() done < /tmp/.lRObjs.$$ fi - # Any sysctls to set? + # Add our compat kenv lines + echo " set kFreeBSD.bootfile=\"kernel\"" + echo " set kFreeBSD.kernel=\"kernel\"" + echo " set kFreeBSD.kernel_options=\"\"" + echo " set kFreeBSD.kernelname=\"/boot/kernel/kernel\"" + echo " set kFreeBSD.module_path=\"/boot/kernel;/boot/modules\"" + + # Any kenv to set? if [ "$haveSysCtls" = "1" ] ; then while read line do @@ -147,8 +154,11 @@ display_loaderopts() echo "$line" | grep -q "vfs.root.mountfrom" if [ $? -eq 0 ] ; then continue ; fi - val="`echo $line | sed 's|"||g'`" - echo " set kFreeBSD.${val}" + line="`echo $line | sed 's|"||g'`" + key="`echo $line | cut -d '=' -f 1`" + val="`echo $line | cut -d '=' -f 2`" + if [ -z "$key" -o -z "$val" ] ; then continue ; fi + echo " set kFreeBSD.${key}=\"${val}\"" done < /tmp/.lSysCtls.$$ fi @@ -160,11 +170,11 @@ display_loaderopts() fi # Set the grub.platform kenv variable - echo " set kFreeBSD.grub.platform=\$grub_platform" + echo " set kFreeBSD.grub.platform=\"\$grub_platform\"" # See if we need to do GELI passphrase passthrough if [ "$haveGELI" = "true" ] ; then - echo " set kFreeBSD.kern.geom.eli.passphrase=\$pass" + echo " set kFreeBSD.kern.geom.eli.passphrase=\"\$pass\"" fi }