From 4cef794d42c29fce58c2c4c8a0dbe949ce1507e6 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 28 Dec 2018 08:05:52 +0100 Subject: [PATCH] installer: find all possible configs and include them Sooner or later we will remove custom configs and this is in the way of simply zapping a file by statically including it. --- src/sbin/opnsense-installer | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/sbin/opnsense-installer b/src/sbin/opnsense-installer index 0513b2b59..770ed8fdf 100755 --- a/src/sbin/opnsense-installer +++ b/src/sbin/opnsense-installer @@ -46,10 +46,16 @@ fi rm -f /tmp/install_complete -daemon -f lua50c51 /usr/local/share/dfuibe_lua/main.lua \ - /usr/local/share/dfuibe_lua/conf/BSDInstaller.lua \ - /usr/local/share/dfuibe_lua/conf/FreeBSD.lua \ - /usr/local/share/dfuibe_lua/conf/Product.lua +CONFIGDIR=/usr/local/share/dfuibe_lua +CONFIGS=${CONFIGDIR}/main.lua + +for CONFIG in BSDInstaller FreeBSD Product; do + if [ -f /usr/local/share/dfuibe_lua/conf/${CONFIG}.lua ]; then + CONFIGS="${CONFIGS} ${CONFIGDIR}/conf/${CONFIG}.lua" + fi +done + +daemon -f lua50c51 ${CONFIGS} conscontrol mute on > /dev/null