diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-06-06 18:35:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-06 18:35:46 +0200 |
commit | 152c8946b3a93bb2c086568832d614cb54f11e13 (patch) | |
tree | f063e1c338af2e2c0cb8cef2ca4122df8043a0d6 /network | |
parent | Merge pull request #33218 from DaanDeMeyer/initrd-modules (diff) | |
download | systemd-152c8946b3a93bb2c086568832d614cb54f11e13.tar.xz systemd-152c8946b3a93bb2c086568832d614cb54f11e13.zip |
Revert "network: add "mac" to alternatives name policy by default" (#33227)
This reverts commit 0f5a529217f1327f020ab54deed09e6fae1f1fef.
As discussed in https://github.com/systemd/systemd/issues/33104,
that patch caused problems in Debian which has a udev drop-in with
[Match]
Path=*-usb-*
[Link]
NamePolicy=mac
The rename fails:
eth0: Policy *mac* yields "enx00*".
eth0: /usr/lib/udev/rules.d/80-net-setup-link.rules:11 NAME 'enx00*'
eth0: /usr/lib/udev/rules.d/99-systemd.rules:69 RUN '/usr/lib/systemd/systemd-sysctl --prefix=/net/ipv4/conf/$name --prefix=/net/ipv4/neigh/$
eth0: sd-device: Created database file '/run/udev/data/n9' for '/devices/pci0000:00/0000:00:1c.4/0000:02:00.0/0000:03:01.0/0000:05:00.0/0000:
eth0: Failed to rename network interface 9 from 'eth0' to 'enx00*': File exists
eth0: sd-device: Created database file '/run/udev/data/n9' for '/devices/pci0000:00/0000:00:1c.4/0000:02:00.0/0000:03:01.0/0000:05:00.0/0000:
eth0: Failed to process device, ignoring: File exists
Two network interfaces have the same MAC and it's not marked NET_ADDR_STOLEN.
In this case the conflict is very visible because it causes the rename to fail,
but it would also occur in other cases, for alternative names.
A patch has been submitted for r8152 to properly set NET_ADDR_STOLEN:
https://lore.kernel.org/linux-usb/20240605153340.25694-1-gmazyland@gmail.com/T/#u
Let's revert this now to avoid a regression. We can try again after the kernel
issue is resolved.
Closes https://github.com/systemd/systemd/issues/33104.
Diffstat (limited to 'network')
-rw-r--r-- | network/99-default.link | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/network/99-default.link b/network/99-default.link index 083dca48c9..56030b62be 100644 --- a/network/99-default.link +++ b/network/99-default.link @@ -11,5 +11,5 @@ OriginalName=* [Link] NamePolicy=keep kernel database onboard slot path -AlternativeNamesPolicy=database onboard slot path mac +AlternativeNamesPolicy=database onboard slot path MACAddressPolicy=persistent |