chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: allow using kdbus from nspawn containers
[elogind.git]
/
src
/
shared
/
net-util.c
diff --git
a/src/shared/net-util.c
b/src/shared/net-util.c
index a8a2c44bae570bae7be5ae985aed3e73ddf59c15..50cfa2c3f3a5a791f903859167523ebda43da131 100644
(file)
--- a/
src/shared/net-util.c
+++ b/
src/shared/net-util.c
@@
-42,6
+42,7
@@
bool net_match_config(const struct ether_addr *match_mac,
Condition *match_arch,
const char *dev_mac,
const char *dev_path,
Condition *match_arch,
const char *dev_mac,
const char *dev_path,
+ const char *dev_parent_driver,
const char *dev_driver,
const char *dev_type,
const char *dev_name) {
const char *dev_driver,
const char *dev_type,
const char *dev_name) {
@@
-64,13
+65,17
@@
bool net_match_config(const struct ether_addr *match_mac,
if (match_path && (!dev_path || fnmatch(match_path, dev_path, 0)))
return 0;
if (match_path && (!dev_path || fnmatch(match_path, dev_path, 0)))
return 0;
- if (match_driver && !streq_ptr(match_driver, dev_driver))
- return 0;
+ if (match_driver) {
+ if (dev_parent_driver && !streq(match_driver, dev_parent_driver))
+ return 0;
+ else if (!streq_ptr(match_driver, dev_driver))
+ return 0;
+ }
if (match_type && !streq_ptr(match_type, dev_type))
return 0;
if (match_type && !streq_ptr(match_type, dev_type))
return 0;
- if (match_name && (!dev_
path
|| fnmatch(match_name, dev_name, 0)))
+ if (match_name && (!dev_
name
|| fnmatch(match_name, dev_name, 0)))
return 0;
return 1;
return 0;
return 1;