diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-02-10 18:30:16 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-02-10 22:30:35 +0100 |
| commit | 5256e00e8b9015dd1a976d647fc71dc7efbd8cf8 (patch) | |
| tree | 371a378a004c556cc4d59122dea969a4148d843c /src/udev | |
| parent | ea6ec096db5f9f3562b9bbf438da7fe21411c74d (diff) | |
net: support globbing and disjunction in Match logic
Match{Name,OrginalName,Type,Driver,Path} can now take a space-separated glob of matches.
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/net/link-config-gperf.gperf | 8 | ||||
| -rw-r--r-- | src/udev/net/link-config.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf index 191ab68fa..b25e4b334 100644 --- a/src/udev/net/link-config-gperf.gperf +++ b/src/udev/net/link-config-gperf.gperf @@ -17,10 +17,10 @@ struct ConfigPerfItem; %includes %% Match.MACAddress, config_parse_hwaddr, 0, offsetof(link_config, match_mac) -Match.OriginalName, config_parse_ifname, 0, offsetof(link_config, match_name) -Match.Path, config_parse_string, 0, offsetof(link_config, match_path) -Match.Driver, config_parse_string, 0, offsetof(link_config, match_driver) -Match.Type, config_parse_string, 0, offsetof(link_config, match_type) +Match.OriginalName, config_parse_ifnames, 0, offsetof(link_config, match_name) +Match.Path, config_parse_strv, 0, offsetof(link_config, match_path) +Match.Driver, config_parse_strv, 0, offsetof(link_config, match_driver) +Match.Type, config_parse_strv, 0, offsetof(link_config, match_type) Match.Host, config_parse_net_condition, CONDITION_HOST, offsetof(link_config, match_host) Match.Virtualization, config_parse_net_condition, CONDITION_VIRTUALIZATION, offsetof(link_config, match_virt) Match.KernelCommandLine, config_parse_net_condition, CONDITION_KERNEL_COMMAND_LINE, offsetof(link_config, match_kernel) diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h index 688f83614..cb434d1ae 100644 --- a/src/udev/net/link-config.h +++ b/src/udev/net/link-config.h @@ -52,10 +52,10 @@ struct link_config { char *filename; struct ether_addr *match_mac; - char *match_path; - char *match_driver; - char *match_type; - char *match_name; + char **match_path; + char **match_driver; + char **match_type; + char **match_name; Condition *match_host; Condition *match_virt; Condition *match_kernel; |