diff --git a/install/librenms-install.sh b/install/librenms-install.sh index 962dc9d..f616558 100644 --- a/install/librenms-install.sh +++ b/install/librenms-install.sh @@ -30,7 +30,7 @@ $STD apt-get install -y \ msg_ok "Installed Dependencies" install_php -MARIADB_VERSION="11.4.5" install_mariadb +install_mariadb install_composer msg_info "Installing Python" diff --git a/misc/build.func b/misc/build.func index 5ca8add..38f4565 100644 --- a/misc/build.func +++ b/misc/build.func @@ -490,7 +490,8 @@ advanced_settings() { while read -r pair; do start=$(echo "${pair}" | cut -d':' -f1) end=$(echo "${pair}" | cut -d':' -f2) - if awk "NR >= ${start} && NR <= ${end}" "${iface_filepath}" | grep -qP '^\s*bridge[-_](ports|stp|fd|vlan-aware|vids)\s+'; then + echo "${start}:${end} --- $(sed "${start}q;d" "${iface_filepath}" | awk '{print $2}')" + if awk "NR >= ${start} && NR <= ${end}" "${iface_filepath}" | grep -qP '^\s*(bridge[-_](ports|stp|fd|vlan-aware|vids)|OVSBridge)\s+'; then iface_name=$(sed "${start}q;d" "${iface_filepath}" | awk '{print $2}') BRIDGES="${iface_name}"$'\n'"${BRIDGES}" fi