Date: Mon, 23 Mar 2015 19:27:05 +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: r382032 - in head/sysutils/grub2-pcbsd: . files Message-ID: <201503231927.t2NJR5vG053883@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmoore Date: Mon Mar 23 19:27:04 2015 New Revision: 382032 URL: https://svnweb.freebsd.org/changeset/ports/382032 QAT: https://qat.redports.org/buildarchive/r382032/ Log: - Add GRUB_NODUALBOOT knob to grub's defaults file This disables support for trying to add disks for dual-boot - Bump PORTREV Modified: head/sysutils/grub2-pcbsd/Makefile head/sysutils/grub2-pcbsd/files/30_os-prober.in Modified: head/sysutils/grub2-pcbsd/Makefile ============================================================================== --- head/sysutils/grub2-pcbsd/Makefile Mon Mar 23 19:24:52 2015 (r382031) +++ head/sysutils/grub2-pcbsd/Makefile Mon Mar 23 19:27:04 2015 (r382032) @@ -3,7 +3,7 @@ PORTNAME= grub2-pcbsd PORTVERSION= 2.02p -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ Modified: head/sysutils/grub2-pcbsd/files/30_os-prober.in ============================================================================== --- head/sysutils/grub2-pcbsd/files/30_os-prober.in Mon Mar 23 19:24:52 2015 (r382031) +++ head/sysutils/grub2-pcbsd/files/30_os-prober.in Mon Mar 23 19:27:04 2015 (r382032) @@ -58,6 +58,13 @@ menuentry "Chainload Disk (hd${hdnum} - EOF } +if [ -e "/usr/local/etc/default/grub" ] ; then + . /usr/local/etc/default/grub +fi +if [ -n "$GRUB_NODUALBOOT" ] ; then + exit 0 +fi + # Look for file-systems on the zpool disk for disk in `zpool status | grep ONLINE | grep -v "state:" | awk '{print $1}'` do
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503231927.t2NJR5vG053883>