diff --git a/CHANGELOG b/CHANGELOG index ae76814..192948e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.2.23......Check/update bastille config parameters on runtime. 1.2.22......Make sure minor changes are always applied. 1.2.21......Check/update bastille config parameters on runtime. 1.2.20......Allow install in zroot platform with optional zfs dataset. diff --git a/bastille-init b/bastille-init index 36cbce1..8f630d2 100755 --- a/bastille-init +++ b/bastille-init @@ -1442,12 +1442,16 @@ update_config() # Check/append network parameters. if ! grep -qw 'bastille_network_vnet_type=' ${INSTALLPATH}/${BASTILLECONF}; then sysrc -f ${INSTALLPATH}/${BASTILLECONF} bastille_network_vnet_type="if_bridge" + elif ! sysrc -f ${INSTALLPATH}/${BASTILLECONF} -n bastille_network_vnet_type | grep -q 'if_bridge'; then + sysrc -f ${INSTALLPATH}/${BASTILLECONF} bastille_network_vnet_type="if_bridge" fi if ! grep -qw 'bastille_network_loopback=' ${INSTALLPATH}/${BASTILLECONF}; then sysrc -f ${INSTALLPATH}/${BASTILLECONF} bastille_network_loopback="" fi if ! grep -qw 'bastille_network_pf_ext_if=' ${INSTALLPATH}/${BASTILLECONF}; then sysrc -f ${INSTALLPATH}/${BASTILLECONF} bastille_network_pf_ext_if="ext_if" + elif ! sysrc -f ${INSTALLPATH}/${BASTILLECONF} -n bastille_network_pf_ext_if | grep -q 'ext_if'; then + sysrc -f ${INSTALLPATH}/${BASTILLECONF} bastille_network_pf_ext_if="ext_if" fi if ! grep -qw 'bastille_network_pf_table=' ${INSTALLPATH}/${BASTILLECONF}; then sysrc -f ${INSTALLPATH}/${BASTILLECONF} bastille_network_pf_table="jails" diff --git a/version b/version index 9a83513..a93a6f7 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.22 +1.2.23