summaryrefslogtreecommitdiff
path: root/udev-remove.c
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-03-31 23:12:57 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:35:13 -0700
commitbbbe503ec1a5623a5a8abd003f46fdd8c3581054 (patch)
tree96d4b8b9c48c22578234454feceb4ba1a44c9dc5 /udev-remove.c
parente5a2989efbae81f40b60885a8f92ea1f87df7ea9 (diff)
[PATCH] netdev - udevdb+dev.d changes
Here is a patch to change the netdev handling in the database and for the dev.d/ calls. I applies on top of the udevd.patch, cause klibc has no sysinfo(). o netdev's are also put into our database now. I want this for the udevruler gui to get a list of all handled devices. All devices in the db are stamped with the system uptime value at the creation time. 'udevinfo -d' prints it. o the DEVPATH value is the key for udevdb, but if we rename a netdev, the name is replaced in the kernel, so we add the changed name to the db to match with the remove event. NOTE: The dev.d/ scripts still get the original name from the hotplug call. Should we replace DEVPATH with the new name too? o We now only add a device to the db, if we have successfully created the main node or successfully renamed a netdev. This is the main part of the patch, cause I needed to clean the retval passing trough all the functions used for node creation. o DEVNODE sounds a bit ugly for netdev's so I exported DEVNAME too. Can we change the name? o I've added a UDEV_NO_DEVD to possibly skip the script execution and used it in udev-test.pl. udevstart is the same horror now, if you have scripts with logging statements in dev.d/ it takes minutes to finish, can we skip the scripts here too? o The get_device_type() function is changed to be more strict, cause 'udevinfo -a -p /block/' gets a class device for it and tries to print the major/minor values. o bugfix, the RESULT value has now a working newline removal and a test for this case.
Diffstat (limited to 'udev-remove.c')
-rw-r--r--udev-remove.c40
1 files changed, 14 insertions, 26 deletions
diff --git a/udev-remove.c b/udev-remove.c
index 98c45d6c33..c838f15ce3 100644
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -137,36 +137,24 @@ int udev_remove_device(char *path, char *subsystem)
memset(&dev, 0x00, sizeof(dev));
- dev.type = get_device_type(path, subsystem);
-
- switch (dev.type) {
- case 'b':
- case 'c':
- retval = udevdb_get_dev(path, &dev);
- if (retval) {
- dbg("'%s' not found in database, falling back on default name", path);
- temp = strrchr(path, '/');
- if (temp == NULL)
- return -ENODEV;
- strfieldcpy(dev.name, &temp[1]);
- }
-
- dbg("name='%s'", dev.name);
- udevdb_delete_dev(path);
+ retval = udevdb_get_dev(path, &dev);
+ if (retval != 0) {
+ dbg("'%s' not found in database, falling back on default name", path);
+ temp = strrchr(path, '/');
+ if (temp == NULL)
+ return -ENODEV;
+ strfieldcpy(dev.name, &temp[1]);
+ }
+ dbg("name='%s'", dev.name);
- dev_d_send(&dev, subsystem);
+ dev.type = get_device_type(path, subsystem);
+ dev_d_send(&dev, subsystem);
+ udevdb_delete_dev(path);
+ if (dev.type == 'b' || dev.type == 'c')
retval = delete_node(&dev);
- break;
-
- case 'n':
+ else if (dev.type == 'n')
retval = 0;
- break;
-
- default:
- dbg("unknown device type '%c'", dev.type);
- retval = -EINVAL;
- }
return retval;
}