Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[202111][Arista] Fix arista-net initramfs renaming logic #10625

Merged
merged 2 commits into from
Apr 20, 2022
Merged

[202111][Arista] Fix arista-net initramfs renaming logic #10625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bb3a27
[Arista] rename management interface in initrd (#9856)
Staphylo Mar 21, 2022
d01d88c
[Arista] Fix arista-net initramfs hook
Staphylo Apr 19, 2022
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
46 changes: 31 additions & 15 deletions files/initramfs-tools/arista-net
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ arista_net_rename() {
local new_name="$2"
local from_name="$3"
devname=$(arista_net_devname "$device_path" "$from_name")
[ -n "$devname" ] && ip link set "$devname" name "$new_name"
if [ -n "$devname" ]; then
ip link set "$devname" name "$new_name"
fi
}

# Sets the MAC address to the value passed by Aboot through /proc/cmdline
Expand Down Expand Up @@ -95,19 +97,33 @@ fi
# Iterate over all the net_maX items found in the cmdline two times.
# First time renaming the interfaces to maX.
# The second time renaming them to their final name ethX.
if [ -n "$aboot_flag" -a "$platform_flag" == 'rook' ]; then
for item in $items; do
key="${item%=*}"
value="${item#*=}"
arista_net_rename "$value" "$key" eth
done
for item in $items; do
key="${item%=*}"
value="${item#*=}"
index="${key#ma}"
index="$(( $index - 1 ))"
newKey="eth$index"
arista_net_rename "$value" "$newKey" ma
done
if [ -n "$aboot_flag" ]; then
if [ "$platform_flag" = 'rook' -o "$platform_flag" = 'lorikeet' ]; then
# Rename existing ethX interfaces to tmpX
for x in $(ls /sys/class/net/); do
case $x in
eth*)
value="${x#*eth}"
newname="tmp$value"
ip link set $x down
ip link set $x name "$newname"
;;
*)
esac
done
for item in $items; do
key="${item%=*}"
value="${item#*=}"
arista_net_rename "$value" "$key" tmp
done
for item in $items; do
key="${item%=*}"
value="${item#*=}"
index="${key#ma}"
index="$(( $index - 1 ))"
newKey="eth$index"
arista_net_rename "$value" "$newKey" ma
done
fi
fi