Merge pull request #22416 from fbuihuu/misc

Misc

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;
         }
 

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);