Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/network.sh
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ compat() {
local interface="$2"
local samba="20.20.20.1"

[[ "$PODMAN" == [Yy1]* ]] && return 0
[[ "$samba" == "$gateway" ]] && return 0
[[ "${BOOT_MODE:-}" != "windows"* ]] && return 0

Expand All @@ -196,10 +195,14 @@ compat() {
fi

# Backwards compatibility with old installations
if ip address add dev "$interface" "$samba/24" label "$interface:compat"; then
if ip address add dev "$interface" "$samba/24" label "$interface:compat" 2>/dev/null; then
SAMBA_INTERFACE="$samba"
else
warn "failed to configure IP alias. $ADD_ERR --cap-add NET_ADMIN"
msg=$(ip address add dev "$interface" "$samba/24" label "$interface:compat" 2>&1)
if [[ "${msg,,}" != *"address already assigned"* && "$PODMAN" != [Yy1]* ]]; then
echo "$msg" >&2
warn "failed to configure IP alias. $ADD_ERR --cap-add NET_ADMIN"
fi
fi

return 0
Expand Down