diff options
| author | Kris Moore <kmoore@FreeBSD.org> | 2014-07-28 16:55:19 +0000 |
|---|---|---|
| committer | Kris Moore <kmoore@FreeBSD.org> | 2014-07-28 16:55:19 +0000 |
| commit | 66b39c4b56ce4559aed8be66a4953bd8ce2bb3de (patch) | |
| tree | faa9a2d82a2cbdcc356b6d873c2ac398c31f8b14 /sysutils/grub2-pcbsd | |
| parent | 3e32a37f51a2d3b2173a1c102752d2967ab5aa46 (diff) | |
| download | ports-66b39c4b56ce4559aed8be66a4953bd8ce2bb3de.tar.gz ports-66b39c4b56ce4559aed8be66a4953bd8ce2bb3de.zip | |
Notes
Diffstat (limited to 'sysutils/grub2-pcbsd')
| -rw-r--r-- | sysutils/grub2-pcbsd/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/grub2-pcbsd/files/00_header.in | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile index e16ce9e9bf89..53e72b902483 100644 --- a/sysutils/grub2-pcbsd/Makefile +++ b/sysutils/grub2-pcbsd/Makefile @@ -3,7 +3,7 @@ PORTNAME= grub2-pcbsd PORTVERSION= 2.02p -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ diff --git a/sysutils/grub2-pcbsd/files/00_header.in b/sysutils/grub2-pcbsd/files/00_header.in index 7a5d27b3240a..d88fb4196159 100644 --- a/sysutils/grub2-pcbsd/files/00_header.in +++ b/sysutils/grub2-pcbsd/files/00_header.in @@ -38,11 +38,17 @@ for i in ${GRUB_PRELOAD_MODULES} ; do echo "insmod $i" done +if [ -e "/root/beadm.install" ] ; then + BEADM="/root/beadm.install" +else + BEADM="beadm" +fi + # If GRUB_DEFAULT is unset, lets figure out which beadm wants to use by default if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 beCount=0 - beadm list -H >/tmp/.grub-beadm.$$ 2>/dev/null + $BEADM list -H >/tmp/.grub-beadm.$$ 2>/dev/null while read line do flags=`echo $line | awk '{print $2}'` @@ -63,7 +69,7 @@ if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=auto ; fi # Check if we have more than one BE, and need to show the menu by default -beNum=`beadm list 2>/dev/null | grep -v 'Mountpoint' | wc -l | awk '{print $1}'` +beNum=`$BEADM list 2>/dev/null | grep -v 'Mountpoint' | wc -l | awk '{print $1}'` if [ $beNum -gt 1 ] ; then GRUB_HIDDEN_TIMEOUT=""; fi if [ "x${GRUB_DEFAULT_BUTTON}" = "x" ] ; then GRUB_DEFAULT_BUTTON="$GRUB_DEFAULT" ; fi |