Merge branch 'main' of https://github.com/community-scripts/ProxmoxVED
This commit is contained in:
commit
860f4f3871
@ -491,7 +491,7 @@ advanced_settings() {
|
|||||||
start=$(echo "${pair}" | cut -d':' -f1)
|
start=$(echo "${pair}" | cut -d':' -f1)
|
||||||
end=$(echo "${pair}" | cut -d':' -f2)
|
end=$(echo "${pair}" | cut -d':' -f2)
|
||||||
echo "${start}:${end} --- $(sed "${start}q;d" "${iface_filepath}" | awk '{print $2}')"
|
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
|
if awk "NR >= ${start} && NR <= ${end}" "${iface_filepath}" | grep -qP '^\s*(bridge[-_](ports|stp|fd|vlan-aware|vids)|ovs_type\s+OVSBridge)\b'; 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
|
||||||
@ -906,7 +906,7 @@ config_file() {
|
|||||||
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
|
if awk "NR >= ${start} && NR <= ${end}" "${iface_filepath}" | grep -qP '^\s*(bridge[-_](ports|stp|fd|vlan-aware|vids)|ovs_type\s+OVSBridge)\b'; 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