chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: add missing makefile symlinks
[elogind.git]
/
src
/
udev
/
udev-builtin-net_setup_link.c
diff --git
a/src/udev/udev-builtin-net_setup_link.c
b/src/udev/udev-builtin-net_setup_link.c
index b7ba8c90609c5b6dc023fe0c16e87005d78b357a..6207269ab9cd129721e9d772b430df7d01122bba 100644
(file)
--- a/
src/udev/udev-builtin-net_setup_link.c
+++ b/
src/udev/udev-builtin-net_setup_link.c
@@
-26,6
+26,7
@@
static link_config_ctx *ctx = NULL;
static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv, bool test) {
static link_config_ctx *ctx = NULL;
static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv, bool test) {
+ _cleanup_free_ char *driver = NULL;
const char *name;
link_config *link;
int r;
const char *name;
link_config *link;
int r;
@@
-35,20
+36,24
@@
static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
+ r = link_get_driver(ctx, dev, &driver);
+ if (r >= 0)
+ udev_builtin_add_property(dev, test, "ID_NET_DRIVER", driver);
+
r = link_config_get(ctx, dev, &link);
if (r < 0) {
if (r == -ENOENT) {
r = link_config_get(ctx, dev, &link);
if (r < 0) {
if (r == -ENOENT) {
- log_debug("No matching link configuration found");
+ log_debug("No matching link configuration found
.
");
return EXIT_SUCCESS;
} else {
return EXIT_SUCCESS;
} else {
- log_error("Could not get link config
"
);
+ log_error("Could not get link config
: %s", strerror(-r)
);
return EXIT_FAILURE;
}
}
r = link_config_apply(ctx, link, dev, &name);
if (r < 0) {
return EXIT_FAILURE;
}
}
r = link_config_apply(ctx, link, dev, &name);
if (r < 0) {
- log_error("Could not apply link config to %s
", udev_device_get_sysname(dev
));
+ log_error("Could not apply link config to %s
: %s", udev_device_get_sysname(dev), strerror(-r
));
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-72,18
+77,18
@@
static int builtin_net_setup_link_init(struct udev *udev) {
if (r < 0)
return r;
if (r < 0)
return r;
- log_debug("Created link configuration context");
+ log_debug("Created link configuration context
.
");
return 0;
}
static void builtin_net_setup_link_exit(struct udev *udev) {
link_config_ctx_free(ctx);
ctx = NULL;
return 0;
}
static void builtin_net_setup_link_exit(struct udev *udev) {
link_config_ctx_free(ctx);
ctx = NULL;
- log_debug("Unloaded link configuration context");
+ log_debug("Unloaded link configuration context
.
");
}
static bool builtin_net_setup_link_validate(struct udev *udev) {
}
static bool builtin_net_setup_link_validate(struct udev *udev) {
- log_debug("Check if link configuration needs reloading");
+ log_debug("Check if link configuration needs reloading
.
");
if (!ctx)
return false;
if (!ctx)
return false;