From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 30 Dec 2021 21:05:21 +0000 (+0900)
Subject: udev: fix ID_NET_NAME_MAC= udev property
X-Git-Tag: v251-rc1~620
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60e930fc3e6eb8a36fbc184773119eb8d2f30364;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index d9d395cb2f8..65e003eb15e 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));