opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build: source SERIAL_* variables from common

This commit is contained in:
Franco Fichtner 2016-03-30 18:25:43 +02:00
parent 554e09c5e5
commit ed1ba8be37
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/common.sh
View File

@ -143,6 +143,12 @@ export PRODUCT_SIGNCMD=${PRODUCT_SIGNCMD:-"${TOOLSDIR}/scripts/pkg_sign.sh ${PRO
export PRODUCT_SIGNCHK=${PRODUCT_SIGNCHK:-"${TOOLSDIR}/scripts/pkg_fingerprint.sh ${PRODUCT_PUBKEY}"}
export PRODUCT_RELEASE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}"
# serial bootstrapping
SERIAL_CONFIG="<enableserial>1</enableserial>"
SERIAL_CONFIG="${SERIAL_CONFIG}<serialspeed>${SERIAL_SPEED}</serialspeed>"
export SERIAL_CONFIG="${SERIAL_CONFIG}<primaryconsole>serial</primaryconsole>"
export SERIAL_SPEED="115200"
# misc. foo
export CONFIG_PKG="/usr/local/etc/pkg/repos/origin.conf"
export CPUS=$(sysctl kern.smp.cpus | awk '{ print $2 }')

6
build/memstick.sh
View File

@ -33,12 +33,6 @@ set -e
SERIALIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-serial-${ARCH}.img"
VGAIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-vga-${ARCH}.img"
SERIAL_SPEED="115200"
SERIAL_CONFIG="<enableserial>1</enableserial>"
SERIAL_CONFIG="${SERIAL_CONFIG}<serialspeed>${SERIAL_SPEED}</serialspeed>"
SERIAL_CONFIG="${SERIAL_CONFIG}<primaryconsole>serial</primaryconsole>"
# rewrite the disk label, because we're install media
LABEL="${LABEL}_Install"

8
build/nano.sh
View File

@ -38,7 +38,7 @@ sh ./clean.sh nano
. ${SRCDIR}/tools/tools/nanobsd/FlashDevice.sub
sub_FlashDevice generic 4g
# chop off excess bytes that do not align to 8 byte boundard
# chop off excess bytes that do not align to 8 byte boundary
NANO_MEDIASIZE=$(expr ${NANO_MEDIASIZE} - \( ${NANO_MEDIASIZE} % 8 \))
setup_stage ${STAGEDIR}
@ -46,17 +46,17 @@ setup_base ${STAGEDIR}
setup_kernel ${STAGEDIR}
setup_packages ${STAGEDIR}
echo "-S115200 -D" > ${STAGEDIR}/boot.config
echo "-S${SERIAL_SPEED} -D" > ${STAGEDIR}/boot.config
cat > ${STAGEDIR}/boot/loader.conf << EOF
kern.geom.part.check_integrity=0
boot_multicons="YES"
boot_serial="YES"
console="comconsole,vidconsole"
comconsole_speed="115200"
comconsole_speed="${SERIAL_SPEED}"
EOF
sed -i '' -e 's:</system>:<enableserial/><use_mfs_tmpvar/></system>:' \
sed -i '' -e "s:</system>:${SERIAL_CONFIG}<use_mfs_tmpvar/></system>:" \
${STAGEDIR}${CONFIG_XML}
sed -i "" -Ee 's:^ttyu0:ttyu0 "/usr/libexec/getty std.9600" cons25 on secure:' ${STAGEDIR}/etc/ttys