Merge branch 'main' of https://github.com/community-scripts/ProxmoxVED
This commit is contained in:
commit
dae20358d3
@ -30,7 +30,7 @@ $STD apt-get install -y \
|
|||||||
msg_ok "Installed Dependencies"
|
msg_ok "Installed Dependencies"
|
||||||
|
|
||||||
install_php
|
install_php
|
||||||
MARIADB_VERSION="11.4.5" install_mariadb
|
install_mariadb
|
||||||
install_composer
|
install_composer
|
||||||
|
|
||||||
msg_info "Installing Python"
|
msg_info "Installing Python"
|
||||||
|
@ -490,7 +490,8 @@ advanced_settings() {
|
|||||||
while read -r pair; do
|
while read -r pair; do
|
||||||
start=$(echo "${pair}" | cut -d':' -f1)
|
start=$(echo "${pair}" | cut -d':' -f1)
|
||||||
end=$(echo "${pair}" | cut -d':' -f2)
|
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}')
|
iface_name=$(sed "${start}q;d" "${iface_filepath}" | awk '{print $2}')
|
||||||
BRIDGES="${iface_name}"$'\n'"${BRIDGES}"
|
BRIDGES="${iface_name}"$'\n'"${BRIDGES}"
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user