peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-29 20:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: refactor gen-interfaces for hybrid bridge/iface setups

Browse Source 
Simplify interface generation by collapsing eth_ and ethlike_ifaces to a
single list.  Let gen_iface_json() determine interface type by querying
each interface.  This allows us to create bridge setups also for qemu
use-cases.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-03-11 14:37:49 +01:00
parent 5faefb2b51
commit 6f185cdfb5
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/bin/gen-interfaces
+19 -17
View File
@@ -56,17 +56,26 @@ EOF
exit 0
}
iftype()
{
iftype=$(ip -d -j link show "$1" |jq -r .[].parentbus)
if [ "$iftype" = "virtio" ]; then
echo "infix-if-type:etherlike"
else
echo "infix-if-type:ethernet"
fi
}
# shellcheck disable=SC3043
gen_iface_json()
{
local iftype="$1"
local ifname="$2"
local br="$3"
local ifname="$1"
local br="$2"
cat <<EOF
,{
"name": "$ifname",
"type": "$iftype",
"type": "$(iftype "$ifname")",
EOF
if [ -n "$br" ]; then
@@ -131,20 +140,14 @@ while [ "$1" != "" ]; do
shift
done
# All exeternal interfaces
phys_ifaces=$(ip -d -j link show | jq -r '
.[] |
select(.link_type == "ether") |
select(.group != "internal") |
select(has("parentbus")) |
select(.parentbus != "virtio") |
.ifname' | sort -V)
virtio_ifaces=$(ip -d -j link show | jq -r '
.[] |
select(.link_type == "ether") |
select(.group != "internal") |
select(has("parentbus")) |
select(.parentbus == "virtio") |
.ifname' | sort -V)
# All interfaces classified as switch ports
ports=$(ip -d -j link show group port | jq -r '
.[] |
select(.link_type == "ether") |
@@ -152,8 +155,8 @@ ports=$(ip -d -j link show group port | jq -r '
select(has("parentbus")) |
.ifname' | sort -V)
eth_ifaces="$(filter_iface_ports "$phys_ifaces" "$ports")"
ethlike_ifaces="$(filter_iface_ports "$virtio_ifaces" "$ports")"
# Remaining external interfaces not classified as switch ports
ifaces="$(filter_iface_ports "$phys_ifaces" "$ports")"
cat <<EOF
{
@@ -188,9 +191,8 @@ fi
cat <<EOF
}
$(for iface in $eth_ifaces; do gen_iface_json "infix-if-type:ethernet" "$iface"; done)
$(for iface in $ethlike_ifaces; do gen_iface_json "infix-if-type:etherlike" "$iface"; done)
$(for iface in $ports; do gen_iface_json "infix-if-type:ethernet" "$iface" "$bridge"; done)
$(for iface in $ifaces; do gen_iface_json "$iface"; done)
$(for iface in $ports; do gen_iface_json "$iface" "$bridge"; done)
]
EOF
if [ "$dhcp" = "true" ] && [ -n "$bridge" ]; then