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

build: add extras.conf with per-type hook, idea by @lattera; closes #30

This commit is contained in:
Franco Fichtner 2016-05-05 17:33:12 +02:00
parent c0f3dbb3fa
commit 3ca6d0cd5d
6 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/common.sh
View File

@ -566,6 +566,19 @@ setup_packages()
clean_packages ${1}
}
setup_extras()
{
if [ ! -f ${CONFIGDIR}/extras.conf ]; then
return
fi
. ${CONFIGDIR}/extras.conf
if type ${2}_hook > /dev/null; then
${2}_hook ${1}
fi
}
setup_mtree()
{
echo ">>> Creating mtree summary of files present..."

1
build/iso.sh
View File

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

16
build/nano.sh
View File

@ -47,21 +47,7 @@ setup_stage ${STAGEDIR}
setup_base ${STAGEDIR}
setup_kernel ${STAGEDIR}
setup_packages ${STAGEDIR}
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="${SERIAL_SPEED}"
EOF
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
setup_extras ${STAGEDIR} ${SELF}
MD=$(mdconfig -a -t swap -s ${NANO_MEDIASIZE} -x ${NANO_SECTS} -y ${NANO_HEADS})

15
build/serial.sh
View File

@ -43,20 +43,7 @@ setup_stage ${STAGEDIR}
setup_base ${STAGEDIR}
setup_kernel ${STAGEDIR}
setup_packages ${STAGEDIR}
setup_extras ${STAGEDIR} ${SELF}
setup_mtree ${STAGEDIR}
setup_entropy ${STAGEDIR}
echo "-S${SERIAL_SPEED} -D" > ${STAGEDIR}/boot.config
cat > ${STAGEDIR}/boot/loader.conf << EOF
boot_multicons="YES"
boot_serial="YES"
console="comconsole,vidconsole"
comconsole_speed="${SERIAL_SPEED}"
EOF
sed -i '' -e "s:</system>:${SERIAL_CONFIG}</system>:" ${STAGEDIR}${CONFIG_XML}
sed -i '' -Ee 's:^ttyu0:ttyu0 "/usr/libexec/getty std.9600" cons25 on secure:' ${STAGEDIR}/etc/ttys
setup_memstick ${STAGEDIR} ${SERIALIMG} ${LABEL}

1
build/vga.sh
View File

@ -42,6 +42,7 @@ setup_stage ${STAGEDIR}
setup_base ${STAGEDIR}
setup_kernel ${STAGEDIR}
setup_packages ${STAGEDIR}
setup_extras ${STAGEDIR} ${SELF}
setup_mtree ${STAGEDIR}
setup_entropy ${STAGEDIR}
setup_memstick ${STAGEDIR} ${VGAIMG} ${LABEL}

33
config/16.1/extras.conf Normal file
View File

@ -0,0 +1,33 @@
nano_hook()
{
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="${SERIAL_SPEED}"
EOF
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
}
serial_hook()
{
echo "-S${SERIAL_SPEED} -D" > ${STAGEDIR}/boot.config
cat > ${STAGEDIR}/boot/loader.conf << EOF
boot_multicons="YES"
boot_serial="YES"
console="comconsole,vidconsole"
comconsole_speed="${SERIAL_SPEED}"
EOF
sed -i '' -e "s:</system>:${SERIAL_CONFIG}</system>:" ${STAGEDIR}${CONFIG_XML}
sed -i '' -Ee 's:^ttyu0:ttyu0 "/usr/libexec/getty std.9600" cons25 on secure:' ${STAGEDIR}/etc/ttys
}