chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: fix md "change"/"remove" handling
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index 32b45e9baca6c039932b4b875b4b03b15425d9a7..e34f09cfe3dc156d7f815d9eb319b60e2678626f 100644
(file)
--- a/
udev/udev-event.c
+++ b/
udev/udev-event.c
@@
-421,14
+421,9
@@
found:
dbg(event->udev, "missing attribute\n");
break;
} else {
dbg(event->udev, "missing attribute\n");
break;
} else {
- struct udev_list_entry *list_entry;
const char *value;
const char *value;
- list_entry = udev_device_get_properties_list_entry(event->dev);
- list_entry = udev_list_entry_get_by_name(list_entry, attr);
- if (list_entry == NULL)
- break;
- value = udev_list_entry_get_value(list_entry);
+ value = udev_device_get_property_value(event->dev, attr);
if (value == NULL)
break;
dbg(event->udev, "substitute env '%s=%s'\n", attr, value);
if (value == NULL)
break;
dbg(event->udev, "substitute env '%s=%s'\n", attr, value);
@@
-477,8
+472,6
@@
static int rename_netif(struct udev_event *event)
info(event->udev, "changing net interface name from '%s' to '%s'\n",
udev_device_get_sysname(dev), event->name);
info(event->udev, "changing net interface name from '%s' to '%s'\n",
udev_device_get_sysname(dev), event->name);
- if (event->test)
- return 0;
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
@@
-512,10
+505,10
@@
static int rename_netif(struct udev_event *event)
goto exit;
}
goto exit;
}
- /* wait
3
0 seconds for our target to become available */
+ /* wait
9
0 seconds for our target to become available */
util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
- util_strlcpy(ifr.ifr_newname,
udev_device_get_devnode(dev)
, IFNAMSIZ);
- loop =
3
0 * 20;
+ util_strlcpy(ifr.ifr_newname,
event->name
, IFNAMSIZ);
+ loop =
9
0 * 20;
while (loop--) {
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err == 0) {
while (loop--) {
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err == 0) {
@@
-529,7
+522,7
@@
static int rename_netif(struct udev_event *event)
break;
}
dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
break;
}
dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
-
udev_device_get_devnode(dev), (3
0 * 20) - loop);
+
event->name, (9
0 * 20) - loop);
usleep(1000 * 1000 / 20);
}
}
usleep(1000 * 1000 / 20);
}
}
@@
-589,28
+582,31
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
util_strlcat(filename, event->name, sizeof(filename));
udev_device_set_devnode(dev, filename);
util_strlcat(filename, event->name, sizeof(filename));
udev_device_set_devnode(dev, filename);
- /* read
current
database entry */
+ /* read
old
database entry */
dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (dev_old != NULL) {
udev_device_read_db(dev_old);
udev_device_set_info_loaded(dev_old);
}
dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (dev_old != NULL) {
udev_device_read_db(dev_old);
udev_device_set_info_loaded(dev_old);
}
- /*
update database, create node and symlinks
*/
+ /*
write current database entry
*/
udev_device_update_db(dev);
udev_device_update_db(dev);
- err = udev_node_add(dev, event->mode, event->uid, event->gid, event->test);
/* remove/update possible left-over symlinks from old database entry */
if (dev_old != NULL) {
/* remove/update possible left-over symlinks from old database entry */
if (dev_old != NULL) {
- udev_node_update_old_links(dev, dev_old
, event->test
);
+ udev_node_update_old_links(dev, dev_old);
udev_device_unref(dev_old);
}
udev_device_unref(dev_old);
}
+
+ /* create new node and symlinks */
+ err = udev_node_add(dev, event->mode, event->uid, event->gid);
goto exit;
}
/* add netif */
if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0) {
dbg(event->udev, "netif add '%s'\n", udev_device_get_devpath(dev));
goto exit;
}
/* add netif */
if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0) {
dbg(event->udev, "netif add '%s'\n", udev_device_get_devpath(dev));
+ udev_device_delete_db(dev);
udev_rules_apply_to_event(rules, event);
if (event->ignore_device) {
udev_rules_apply_to_event(rules, event);
if (event->ignore_device) {
@@
-644,6
+640,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
info(event->udev, "changed devpath to '%s'\n", udev_device_get_devpath(dev));
}
}
info(event->udev, "changed devpath to '%s'\n", udev_device_get_devpath(dev));
}
}
+ udev_device_update_db(dev);
goto exit;
}
goto exit;
}
@@
-676,7
+673,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
goto exit;
}
goto exit;
}
- err = udev_node_remove(dev
, event->test
);
+ err = udev_node_remove(dev);
goto exit;
}
goto exit;
}
@@
-684,6
+681,11
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
udev_rules_apply_to_event(rules, event);
if (event->ignore_device)
info(event->udev, "device event will be ignored\n");
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);
+ else
+ udev_device_delete_db(dev);
exit:
return err;
}
exit:
return err;
}