build: nope vt(4); boot serial via probe; moar style
This commit is contained in:
parent
af04ac8e63
commit
1a0793ea6f
|
@ -28,7 +28,7 @@
|
|||
set -e
|
||||
|
||||
# important build settings
|
||||
export PRODUCT_VERSION=${PRODUCT_VERSION:-"`date '+%Y%m%d%H%M'`"}
|
||||
export PRODUCT_VERSION=${PRODUCT_VERSION:-$(date '+%Y%m%d%H%M')}
|
||||
export PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR:-"OpenSSL"}
|
||||
export PRODUCT_NAME="OPNsense"
|
||||
|
||||
|
@ -43,9 +43,9 @@ export SRCDIR="/usr/src"
|
|||
|
||||
# misc. foo
|
||||
export CONFIG_PKG="/usr/local/etc/pkg/repos/${PRODUCT_NAME}.conf"
|
||||
export CPUS=`sysctl kern.smp.cpus | awk '{ print $2 }'`
|
||||
export CPUS=$(sysctl kern.smp.cpus | awk '{ print $2 }')
|
||||
export CONFIG_XML="/usr/local/etc/config.xml"
|
||||
export ARCH=${ARCH:-"`uname -m`"}
|
||||
export ARCH=${ARCH:-$(uname -m)}
|
||||
export LABEL=${PRODUCT_NAME}
|
||||
export TARGET_ARCH=${ARCH}
|
||||
export TARGETARCH=${ARCH}
|
||||
|
@ -142,11 +142,6 @@ setup_base()
|
|||
|
||||
tar -C ${1} -xpf ${BASE_SET}
|
||||
|
||||
# setup vt(4) consistently
|
||||
cat > ${1}/boot/loader.conf << EOF
|
||||
kern.vty="vt"
|
||||
EOF
|
||||
|
||||
# /home is needed for LiveCD images, and since it
|
||||
# belongs to the base system, we create it from here.
|
||||
mkdir -p ${1}/home
|
||||
|
@ -165,6 +160,7 @@ EOF
|
|||
setup_kernel()
|
||||
{
|
||||
local KERNEL_SET KERNEL_VER
|
||||
|
||||
echo ">>> Setting up kernel in ${1}"
|
||||
|
||||
KERNEL_SET=$(ls ${SETSDIR}/kernel-*-${ARCH}.txz)
|
||||
|
|
|
@ -41,7 +41,7 @@ setup_mtree ${STAGEDIR}
|
|||
echo -n ">>> Building ISO image... "
|
||||
|
||||
# must be upper case:
|
||||
LABEL=`echo ${LABEL} | tr '[:lower:]' '[:upper:]'`
|
||||
LABEL=$(echo ${LABEL} | tr '[:lower:]' '[:upper:]')
|
||||
|
||||
cat > ${STAGEDIR}/etc/fstab << EOF
|
||||
# Device Mountpoint FStype Options Dump Pass #
|
||||
|
|
|
@ -49,7 +49,7 @@ EOF
|
|||
|
||||
makefs -t ffs -B little -o label=${LABEL} ${VGAIMG} ${STAGEDIR}
|
||||
|
||||
echo "-S115200 -h" > ${STAGEDIR}/boot.config
|
||||
echo "-S115200 -P" > ${STAGEDIR}/boot.config
|
||||
|
||||
sed -i '' -e 's:</system>:<enableserial/></system>:' \
|
||||
${STAGEDIR}${CONFIG_XML}
|
||||
|
|
|
@ -39,14 +39,14 @@ setup_base ${STAGEDIR}
|
|||
setup_kernel ${STAGEDIR}
|
||||
setup_packages ${STAGEDIR} opnsense
|
||||
|
||||
echo "-S115200 -h" > ${STAGEDIR}/boot.config
|
||||
echo "-S115200 -P" > ${STAGEDIR}/boot.config
|
||||
|
||||
sed -i '' -e 's:</system>:<enableserial/><use_mfs_tmpvar/></system>:' \
|
||||
${STAGEDIR}${CONFIG_XML}
|
||||
|
||||
sed -i "" -Ee 's:^ttyu0:ttyu0 "/usr/libexec/getty std.9600" cons25 on secure:' ${STAGEDIR}/etc/ttys
|
||||
|
||||
MD=`mdconfig -a -t swap -s ${NANO_MEDIASIZE} -x ${NANO_SECTS} -y ${NANO_HEADS}`
|
||||
MD=$(mdconfig -a -t swap -s ${NANO_MEDIASIZE} -x ${NANO_SECTS} -y ${NANO_HEADS})
|
||||
|
||||
# NanoBSD knobs; do not change lightly
|
||||
NANO_IMAGES=2
|
||||
|
|
Loading…
Reference in New Issue