From 19ff06b3a4cb2a2e1612e5774f75a145995b4849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alvin=20=C5=A0ipraga?= <63646079+sipraga@users.noreply.github.com> Date: Thu, 10 Feb 2022 08:19:28 +0100 Subject: [PATCH] udev/net: support Match.Firmware= in .link files (#22462) In cbcdcaaa0ec5 ("Add support for conditions on the machines firmware") a new Firmware= directive was added for .netdev and .network files. While it was also documented to work on .link files, in actual fact the support was missing. Add that one extra line to make it work, and also update the fuzzer directives. --- src/udev/net/link-config-gperf.gperf | 1 + test/fuzz/fuzz-link-parser/directives.link | 1 + test/fuzz/fuzz-unit-file/directives-all.service | 1 + 3 files changed, 3 insertions(+) diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf index fe33507694d..17b3697077c 100644 --- a/src/udev/net/link-config-gperf.gperf +++ b/src/udev/net/link-config-gperf.gperf @@ -34,6 +34,7 @@ Match.Virtualization, config_parse_net_condition, Match.KernelCommandLine, config_parse_net_condition, CONDITION_KERNEL_COMMAND_LINE, offsetof(LinkConfig, conditions) Match.KernelVersion, config_parse_net_condition, CONDITION_KERNEL_VERSION, offsetof(LinkConfig, conditions) Match.Architecture, config_parse_net_condition, CONDITION_ARCHITECTURE, offsetof(LinkConfig, conditions) +Match.Firmware, config_parse_net_condition, CONDITION_FIRMWARE, offsetof(LinkConfig, conditions) Link.Description, config_parse_string, 0, offsetof(LinkConfig, description) Link.MACAddressPolicy, config_parse_mac_address_policy, 0, offsetof(LinkConfig, mac_address_policy) Link.MACAddress, config_parse_hw_addr, 0, offsetof(LinkConfig, hw_addr) diff --git a/test/fuzz/fuzz-link-parser/directives.link b/test/fuzz/fuzz-link-parser/directives.link index bffdce0ec95..eae76749eb6 100644 --- a/test/fuzz/fuzz-link-parser/directives.link +++ b/test/fuzz/fuzz-link-parser/directives.link @@ -11,6 +11,7 @@ Virtualization= KernelCommandLine= KernelVersion= Architecture= +Firmware= [Link] Description= MACAddressPolicy= diff --git a/test/fuzz/fuzz-unit-file/directives-all.service b/test/fuzz/fuzz-unit-file/directives-all.service index 699a9c5ae48..3b5ea3f9e35 100644 --- a/test/fuzz/fuzz-unit-file/directives-all.service +++ b/test/fuzz/fuzz-unit-file/directives-all.service @@ -386,6 +386,7 @@ AllowPortToBeRoot= AllowedIPs= Anonymize= Architecture= +Firmware= AutoJoin= AutoNegotiation= BindCarrier=