From 05c05dc0a3c09b8bafc4659dde75e6b5fd9343fa Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 18 Jan 2022 15:14:12 +0100 Subject: [PATCH 1/2] core: make use of VALID_CHARS_WITH_AT in unit_name_is_valid() --- src/basic/unit-name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c index 671e30a53f..0a4843f458 100644 --- a/src/basic/unit-name.c +++ b/src/basic/unit-name.c @@ -57,7 +57,7 @@ bool unit_name_is_valid(const char *n, UnitNameFlags flags) { if (*i == '@' && !at) at = i; - if (!strchr("@" VALID_CHARS, *i)) + if (!strchr(VALID_CHARS_WITH_AT, *i)) return false; } From e36b00e938ef577ecff7ed4d24363f755be0ea76 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 27 Jan 2022 19:13:24 +0100 Subject: [PATCH 2/2] udev/net_id: show the correct identifier in the debug output of dev_pci_onboard() --- src/udev/udev-builtin-net_id.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index 65e003eb15..9e4297adaf 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -217,7 +217,7 @@ static int dev_pci_onboard(sd_device *dev, const LinkInfo *info, NetNames *names names->pci_onboard[0] = '\0'; log_device_debug(dev, "Onboard index identifier: index=%lu phys_port=%s dev_port=%lu → %s", idx, strempty(info->phys_port_name), dev_port, - empty_to_na(names->pci_slot)); + empty_to_na(names->pci_onboard)); if (sd_device_get_sysattr_value(names->pcidev, "label", &names->pci_onboard_label) >= 0) log_device_debug(dev, "Onboard label from PCI device: %s", names->pci_onboard_label);