chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure.ac: version bump
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index 701c0618206f32aec0baeb545301b5291a3f766f..4e1773ffeaf156807385d625f7499d62da12da0d 100644
(file)
--- a/
udev/udev-event.c
+++ b/
udev/udev-event.c
@@
-492,8
+492,7
@@
static int rename_netif(struct udev_event *event)
}
/* free our own name, another process may wait for us */
}
/* free our own name, another process may wait for us */
- util_strscpy(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev));
- util_strscpy(ifr.ifr_newname, IFNAMSIZ, "_rename");
+ util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "_rename", NULL);
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err != 0) {
err(event->udev, "error changing netif name %s to %s: %m\n",
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err != 0) {
err(event->udev, "error changing netif name %s to %s: %m\n",
@@
-569,12
+568,6
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
event->tmp_node = NULL;
}
event->tmp_node = NULL;
}
- if (event->ignore_device) {
- info(event->udev, "device event will be ignored\n");
- delete_kdevnode = 1;
- goto exit_add;
- }
-
if (event->name != NULL && event->name[0] == '\0') {
info(event->udev, "device node creation suppressed\n");
delete_kdevnode = 1;
if (event->name != NULL && event->name[0] == '\0') {
info(event->udev, "device node creation suppressed\n");
delete_kdevnode = 1;
@@
-639,10
+632,6
@@
exit_add:
udev_device_delete_db(dev);
udev_rules_apply_to_event(rules, event);
udev_device_delete_db(dev);
udev_rules_apply_to_event(rules, event);
- if (event->ignore_device) {
- info(event->udev, "device event will be ignored\n");
- goto exit;
- }
if (event->name == NULL)
goto exit;
if (event->name == NULL)
goto exit;
@@
-695,10
+684,6
@@
exit_add:
}
udev_rules_apply_to_event(rules, event);
}
udev_rules_apply_to_event(rules, event);
- if (event->ignore_device) {
- info(event->udev, "device event will be ignored\n");
- goto exit;
- }
if (udev_device_get_ignore_remove(dev)) {
info(event->udev, "ignore_remove for '%s'\n", udev_device_get_devnode(dev));
if (udev_device_get_ignore_remove(dev)) {
info(event->udev, "ignore_remove for '%s'\n", udev_device_get_devnode(dev));
@@
-711,8
+696,6
@@
exit_add:
/* default devices */
udev_rules_apply_to_event(rules, event);
/* default devices */
udev_rules_apply_to_event(rules, event);
- if (event->ignore_device)
- info(event->udev, "device event will be ignored\n");
if (strcmp(udev_device_get_action(dev), "remove") != 0)
udev_device_update_db(dev);
if (strcmp(udev_device_get_action(dev), "remove") != 0)
udev_device_update_db(dev);