chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
never queue events with TIMEOUT set
[elogind.git]
/
udev_event.c
diff --git
a/udev_event.c
b/udev_event.c
index 8a3ed29315fd5fed00feea03b216c7e12d05ecb7..fae5a465972bcf6ad7ab63c30a232b48b3bef123 100644
(file)
--- a/
udev_event.c
+++ b/
udev_event.c
@@
-28,10
+28,6
@@
#include <ctype.h>
#include <dirent.h>
#include <syslog.h>
#include <ctype.h>
#include <dirent.h>
#include <syslog.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/utsname.h>
#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_libc_wrapper.h"
#include "udev.h"
@@
-95,15
+91,21
@@
int udev_process_event(struct udev_rules *rules, struct udevice *udev)
}
sysfs_close_class_device(class_dev);
} else if (strcmp(udev->action, "remove") == 0) {
}
sysfs_close_class_device(class_dev);
} else if (strcmp(udev->action, "remove") == 0) {
+ struct name_entry *name_loop;
+
+ /* get data from db, remove db-entry, delete node */
dbg("node remove");
dbg("node remove");
+ retval = udev_remove_device(udev);
+
+ /* restore stored persistent data */
+ list_for_each_entry(name_loop, &udev->env_list, node)
+ putenv(name_loop->name);
+
udev_rules_get_run(rules, udev, NULL, NULL);
if (udev->ignore_device) {
dbg("device event will be ignored");
return -1;
}
udev_rules_get_run(rules, udev, NULL, NULL);
if (udev->ignore_device) {
dbg("device event will be ignored");
return -1;
}
-
- /* get name from db, remove db-entry, delete node */
- retval = udev_remove_device(udev);
}
/* export name of device node or netif */
}
/* export name of device node or netif */