/*
* udev-remove.c
*
- * Userspace devfs
- *
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
continue;;
}
- dbg("removing symlink '%s'", filename);
+ info("removing symlink '%s'", filename);
unlink(filename);
if (strchr(filename, '/'))
*/
int udev_remove_device(struct udevice *udev)
{
- const char *temp;
-
if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
return 0;
dbg("remove name='%s'", udev->name);
udev_db_delete_device(udev);
} else {
- /* fall back to kernel name */
- temp = strrchr(udev->devpath, '/');
- if (temp == NULL)
- return -ENODEV;
- strlcpy(udev->name, &temp[1], sizeof(udev->name));
- info("'%s' not found in database, falling back on default name", udev->name);
+ dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
+ strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
}
-
/* use full path to the environment */
snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
udev->devname[sizeof(udev->devname)-1] = '\0';