From 7f96fef66fc0537c28dbe5c44183f583fe054d4f Mon Sep 17 00:00:00 2001 From: Michel Roegl-Brunner Date: Thu, 15 May 2025 09:40:22 +0200 Subject: [PATCH 1/4] Changes to Bridge detection --- misc/build.func | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/build.func b/misc/build.func index 5ca8add..cb83bae 100644 --- a/misc/build.func +++ b/misc/build.func @@ -490,6 +490,7 @@ advanced_settings() { while read -r pair; do start=$(echo "${pair}" | cut -d':' -f1) end=$(echo "${pair}" | cut -d':' -f2) + echo "${start}:${end} --- ${iface_filepath}" if awk "NR >= ${start} && NR <= ${end}" "${iface_filepath}" | grep -qP '^\s*bridge[-_](ports|stp|fd|vlan-aware|vids)\s+'; then iface_name=$(sed "${start}q;d" "${iface_filepath}" | awk '{print $2}') BRIDGES="${iface_name}"$'\n'"${BRIDGES}" From 6921f19bee6e8ba4833d84b4c925da83c7b7309d Mon Sep 17 00:00:00 2001 From: Michel Roegl-Brunner Date: Thu, 15 May 2025 09:40:47 +0200 Subject: [PATCH 2/4] Update LibreNSM --- install/librenms-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From bb448637670e95ac3501162a7feedce78a2257ad Mon Sep 17 00:00:00 2001 From: Michel Roegl-Brunner Date: Thu, 15 May 2025 09:43:06 +0200 Subject: [PATCH 3/4] Update LibreNSM --- misc/build.func | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/build.func b/misc/build.func index cb83bae..b19a0e9 100644 --- a/misc/build.func +++ b/misc/build.func @@ -490,7 +490,7 @@ advanced_settings() { while read -r pair; do start=$(echo "${pair}" | cut -d':' -f1) end=$(echo "${pair}" | cut -d':' -f2) - echo "${start}:${end} --- ${iface_filepath}" + 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)\s+'; then iface_name=$(sed "${start}q;d" "${iface_filepath}" | awk '{print $2}') BRIDGES="${iface_name}"$'\n'"${BRIDGES}" From 7239210eadee9fc3c4b7a829e7293cf8df81298a Mon Sep 17 00:00:00 2001 From: Michel Roegl-Brunner Date: Thu, 15 May 2025 09:43:52 +0200 Subject: [PATCH 4/4] Bridge Detection --- misc/build.func | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/build.func b/misc/build.func index b19a0e9..38f4565 100644 --- a/misc/build.func +++ b/misc/build.func @@ -491,7 +491,7 @@ advanced_settings() { start=$(echo "${pair}" | cut -d':' -f1) end=$(echo "${pair}" | cut -d':' -f2) 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)\s+'; then + 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