mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-03 11:12:13 +00:00
Code Issues Releases Activity

- Fix an issue setting kenv values in grub.cfg with ; or " in the string

Browse Source 
- Add some default kenv values to match /boot/defaults/loader.conf
 - Bump PORTREV
This commit is contained in:
Kris Moore 2014-11-12 17:48:18 +00:00
parent 23beeb5d13
commit 060c0a1c73
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=372498
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/grub2-pcbsd/Makefile
View File

@ -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/

22
sysutils/grub2-pcbsd/files/10_ktrueos.in
View File

@ -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
}