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

build: split nano and serial configs 

Serial is better off being serial-only, while we keep nano in a
split mode for now...

PR: https://github.com/opnsense/core/issues/1101
This commit is contained in:
Franco Fichtner 2016-08-02 23:49:19 +02:00
parent 46ccc04657
commit 5213355727
4 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/common.sh
View File

@ -687,24 +687,6 @@ setup_packages()
clean_packages ${1}
}
setup_serial()
{
SERIAL_CONFIG="<enableserial>1</enableserial>"
SERIAL_CONFIG="${SERIAL_CONFIG}<serialspeed>${PRODUCT_SPEED}</serialspeed>"
SERIAL_CONFIG="${SERIAL_CONFIG}<primaryconsole>serial</primaryconsole>"
echo "-S${PRODUCT_SPEED} -D" > ${1}/boot.config
cat >> ${1}/boot/loader.conf << EOF
boot_multicons="YES"
boot_serial="YES"
console="comconsole,vidconsole"
comconsole_speed="${PRODUCT_SPEED}"
EOF
sed -i '' -e "s:</system>:${SERIAL_CONFIG}</system>:" ${1}${CONFIG_XML}
}
_setup_extras_generic()
{
if [ ! -f ${CONFIGDIR}/extras.conf ]; then

1
build/nano.sh
View File

@ -49,7 +49,6 @@ setup_stage ${STAGEDIR} mnt work
setup_base ${STAGEDIR}/work
setup_kernel ${STAGEDIR}/work
setup_packages ${STAGEDIR}/work
setup_serial ${STAGEDIR}/work
setup_extras ${STAGEDIR}/work ${SELF}
MD=$(mdconfig -a -t swap -s ${NANO_MEDIASIZE} -x ${NANO_SECTS} -y ${NANO_HEADS})

1
build/serial.sh
View File

@ -45,7 +45,6 @@ setup_stage ${STAGEDIR}
setup_base ${STAGEDIR}
setup_kernel ${STAGEDIR}
setup_packages ${STAGEDIR}
setup_serial ${STAGEDIR}
setup_extras ${STAGEDIR} ${SELF}
setup_mtree ${STAGEDIR}
setup_entropy ${STAGEDIR}

42
config/16.7/extras.conf
View File

@ -1,9 +1,41 @@
nano_hook()
{
cat >> ${1}/boot/loader.conf << EOF
kern.geom.part.check_integrity=0
EOF
NANO_CONFIG="
<use_mfs_tmpvar/>
<enableserial>1</enableserial>
<serialspeed>${PRODUCT_SPEED}</serialspeed>
<primaryconsole>serial</primaryconsole>
<secondaryconsole>vga</secondaryconsole>
"
sed -i '' -e "s:</system>:<use_mfs_tmpvar/></system>:" \
${1}${CONFIG_XML}
sed -i '' -e "s:</system>:${NANO_CONFIG}</system>:" ${1}${CONFIG_XML}
echo "-S${PRODUCT_SPEED} -D" > ${1}/boot.config
cat >> ${1}/boot/loader.conf << EOF
comconsole_speed="${PRODUCT_SPEED}"
console="comconsole,vidconsole"
kern.geom.part.check_integrity=0
boot_multicons="YES"
boot_serial="YES"
EOF
}
serial_hook()
{
SERIAL_CONFIG="
<enableserial>1</enableserial>
<serialspeed>${PRODUCT_SPEED}</serialspeed>
<primaryconsole>serial</primaryconsole>
"
sed -i '' -e "s:</system>:${SERIAL_CONFIG}</system>:" ${1}${CONFIG_XML}
echo "-S${PRODUCT_SPEED} -D" > ${1}/boot.config
cat >> ${1}/boot/loader.conf << EOF
comconsole_speed="${PRODUCT_SPEED}"
console="comconsole"
boot_serial="YES"
EOF
}