GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

kvmd-bootconfig: fixed route metrics between eth0/wlan0

Browse Source
This commit is contained in:
Maxim Devaev 2023-12-02 15:02:13 +02:00
parent 968fb41884
commit 83d24169f5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/kvmd-bootconfig
View File

@ -130,6 +130,7 @@ fi
make_dhcp_iface() { make_dhcp_iface() {
local _iface="$1" local _iface="$1"
local _metric="$2"
cat <<end_of_file > "/etc/systemd/network/$_iface.network" cat <<end_of_file > "/etc/systemd/network/$_iface.network"
[Match] [Match]
Name=$_iface Name=$_iface
@ -142,7 +143,7 @@ DNSSEC=no
# Use same IP by forcing to use MAC address for clientID # Use same IP by forcing to use MAC address for clientID
ClientIdentifier=mac ClientIdentifier=mac
# https://github.com/pikvm/pikvm/issues/583 # https://github.com/pikvm/pikvm/issues/583
RouteMetric=10 RouteMetric=$_metric
end_of_file end_of_file
} }
@ -151,6 +152,7 @@ make_static_iface() {
local _addr="$2" local _addr="$2"
local _gw="$3" local _gw="$3"
local _dns="$4" local _dns="$4"
local _metric="$5"
cat <<end_of_file > "/etc/systemd/network/$_iface.network" cat <<end_of_file > "/etc/systemd/network/$_iface.network"
[Match] [Match]
Name=$_iface Name=$_iface
@ -162,19 +164,21 @@ DNSSEC=no
[Route] [Route]
Gateway=$_gw Gateway=$_gw
# https://github.com/pikvm/pikvm/issues/583
Metric=$_metric
end_of_file end_of_file
} }
# If the ETH_DHCP is defined, configure eth0 for DHCP # If the ETH_DHCP is defined, configure eth0 for DHCP
if [ -n "$ETH_DHCP" ]; then if [ -n "$ETH_DHCP" ]; then
ETH_IFACE="${ETH_IFACE:-eth0}" ETH_IFACE="${ETH_IFACE:-eth0}"
make_dhcp_iface "$ETH_IFACE" make_dhcp_iface "$ETH_IFACE" 10
fi fi
# If the ETH_ADDR is defined, configure a static address on eth0 # If the ETH_ADDR is defined, configure a static address on eth0
if [ -n "$ETH_ADDR" ]; then if [ -n "$ETH_ADDR" ]; then
ETH_IFACE="${ETH_IFACE:-eth0}" ETH_IFACE="${ETH_IFACE:-eth0}"
make_static_iface "$ETH_IFACE" "$ETH_ADDR" "$ETH_GW" "$ETH_DNS" make_static_iface "$ETH_IFACE" "$ETH_ADDR" "$ETH_GW" "$ETH_DNS" 10
fi fi
@ -192,9 +196,9 @@ fi
if [ -n "$WIFI_ESSID" ]; then if [ -n "$WIFI_ESSID" ]; then
WIFI_IFACE="${WIFI_IFACE:-wlan0}" WIFI_IFACE="${WIFI_IFACE:-wlan0}"
if [ -n "$WIFI_ADDR" ]; then if [ -n "$WIFI_ADDR" ]; then
make_static_iface "$WIFI_IFACE" "$WIFI_ADDR" "$WIFI_GW" "$WIFI_DNS" make_static_iface "$WIFI_IFACE" "$WIFI_ADDR" "$WIFI_GW" "$WIFI_DNS" 50
else else
make_dhcp_iface "$WIFI_IFACE" make_dhcp_iface "$WIFI_IFACE" 50
fi fi
wpa_passphrase "$WIFI_ESSID" "$WIFI_PASSWD" > "/etc/wpa_supplicant/wpa_supplicant-$WIFI_IFACE.conf" wpa_passphrase "$WIFI_ESSID" "$WIFI_PASSWD" > "/etc/wpa_supplicant/wpa_supplicant-$WIFI_IFACE.conf"
chmod 640 "/etc/wpa_supplicant/wpa_supplicant-$WIFI_IFACE.conf" chmod 640 "/etc/wpa_supplicant/wpa_supplicant-$WIFI_IFACE.conf"