summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-12-31 06:05:21 +0900
committerLuca Boccassi <luca.boccassi@gmail.com>2021-12-31 13:21:12 +0000
commit60e930fc3e6eb8a36fbc184773119eb8d2f30364 (patch)
treedfe94c97bfedd40af1d367eee3f8112c4397ff8b
parentaac8071730bd0bca3c2289bda628b1ef7a2591d2 (diff)
downloadsystemd-60e930fc3e6eb8a36fbc184773119eb8d2f30364.tar.gz
udev: fix ID_NET_NAME_MAC= udev property
This fixes a bug introduced by eaba9bb3e69635d2c490c5e1b0d262b763753e1d. The commit mistakenly drops 'x' in ID_NET_NAME_MAC, and adds colons. The colons were dropped by the commit dfa4876c417e2a9935d58100d44d94bb41cd5bfb, but the missing 'x' was not added at that time. Follow-up for dfa4876c417e2a9935d58100d44d94bb41cd5bfb.
-rw-r--r--src/udev/udev-builtin-net_id.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index d9d395cb2f..65e003eb15 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -1018,7 +1018,7 @@ static int builtin_net_id(sd_device *dev, sd_netlink **rtnl, int argc, char *arg
if (names_mac(dev, &info) >= 0) {
char str[ALTIFNAMSIZ];
- xsprintf(str, "%s%s", prefix, HW_ADDR_TO_STR_FULL(&info.hw_addr, HW_ADDR_TO_STRING_NO_COLON));
+ xsprintf(str, "%sx%s", prefix, HW_ADDR_TO_STR_FULL(&info.hw_addr, HW_ADDR_TO_STRING_NO_COLON));
udev_builtin_add_property(dev, test, "ID_NET_NAME_MAC", str);
log_device_debug(dev, "MAC address identifier: hw_addr=%s → %s",
HW_ADDR_TO_STR(&info.hw_addr), str + strlen(prefix));