chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] handle renamed network interfaces properly if we manage hotplug.d/
[elogind.git]
/
udev_sysfs.c
diff --git
a/udev_sysfs.c
b/udev_sysfs.c
index 6655968433cfb47a63d6373b3650b5c8e7a95279..d46f1f26d85bf94fc55eab0a425ba2f164aac15d 100644
(file)
--- a/
udev_sysfs.c
+++ b/
udev_sysfs.c
@@
-39,6
+39,7
@@
static const struct subsystem_file {
const char *subsystem;
const char *file;
} subsystem_files[] = {
const char *subsystem;
const char *file;
} subsystem_files[] = {
+ { .subsystem = "class", .file = NULL },
{ .subsystem = "net", .file = "ifindex" },
{ .subsystem = "scsi_host", .file = "unique_id" },
{ .subsystem = "scsi_device", .file = NULL },
{ .subsystem = "net", .file = "ifindex" },
{ .subsystem = "scsi_host", .file = "unique_id" },
{ .subsystem = "scsi_device", .file = NULL },
@@
-51,6
+52,10
@@
static const struct subsystem_file {
{ .subsystem = "ieee1394", .file = NULL },
{ .subsystem = "ieee1394_host", .file = NULL },
{ .subsystem = "ieee1394_node", .file = NULL },
{ .subsystem = "ieee1394", .file = NULL },
{ .subsystem = "ieee1394_host", .file = NULL },
{ .subsystem = "ieee1394_node", .file = NULL },
+ { .subsystem = "fc_transport", .file = "port_id" },
+ { .subsystem = "fc_host", .file = "port_id" },
+ { .subsystem = "spi_transport", .file = "width" },
+ { .subsystem = "spi_host", .file = "width" },
{ NULL, NULL }
};
{ NULL, NULL }
};
@@
-170,9
+175,12
@@
static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
{ .subsystem = "net", .device = "bnep" },
{ .subsystem = "net", .device = "vmnet" },
{ .subsystem = "net", .device = "ippp" },
{ .subsystem = "net", .device = "bnep" },
{ .subsystem = "net", .device = "vmnet" },
{ .subsystem = "net", .device = "ippp" },
+ { .subsystem = "net", .device = "nlv" },
+ { .subsystem = "net", .device = "atml" },
{ .subsystem = "ppp", .device = NULL },
{ .subsystem = "sound", .device = NULL },
{ .subsystem = "printer", .device = "lp" },
{ .subsystem = "ppp", .device = NULL },
{ .subsystem = "sound", .device = NULL },
{ .subsystem = "printer", .device = "lp" },
+ { .subsystem = "ppdev", .device = NULL },
{ .subsystem = "nvidia", .device = NULL },
{ .subsystem = "video4linux", .device = "vbi" },
{ .subsystem = "dvb", .device = NULL },
{ .subsystem = "nvidia", .device = NULL },
{ .subsystem = "video4linux", .device = "vbi" },
{ .subsystem = "dvb", .device = NULL },
@@
-274,6
+282,7
@@
int wait_for_devices_device(struct sysfs_device *devices_dev,
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{ .bus = "platform", .file = "detach_state" },
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{ .bus = "platform", .file = "detach_state" },
+ { .bus = "pcmcia", .file = "detach_state" },
{ .bus = "i2c", .file = "detach_state" },
{ .bus = "ieee1394", .file = "node_count" },
{ .bus = "ieee1394", .file = "nodeid" },
{ .bus = "i2c", .file = "detach_state" },
{ .bus = "ieee1394", .file = "node_count" },
{ .bus = "ieee1394", .file = "nodeid" },