/*
- * udev_device.c - main udev data object
- *
* Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "udev_rules.h"
-struct udevice *udev_device_init(void)
+struct udevice *udev_device_init(struct udevice *udev)
{
- struct udevice *udev;
-
- udev = malloc(sizeof(struct udevice));
+ if (udev == NULL)
+ udev = malloc(sizeof(struct udevice));
if (udev == NULL)
return NULL;
memset(udev, 0x00, sizeof(struct udevice));
dev_t udev_device_get_devt(struct udevice *udev)
{
const char *attr;
- unsigned int major, minor;
+ unsigned int maj, min;
/* read it from sysfs */
attr = sysfs_attr_get_value(udev->dev->devpath, "dev");
if (attr != NULL) {
- if (sscanf(attr, "%u:%u", &major, &minor) == 2)
- return makedev(major, minor);
+ if (sscanf(attr, "%u:%u", &maj, &min) == 2)
+ return makedev(maj, min);
}
return makedev(0, 0);
}
strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
loop = 30 * 20;
while (loop--) {
- retval = ioctl(sk, SIOCSIFNAME, &ifr);
- if (retval != 0) {
- if (errno != EEXIST) {
- err("error changing net interface name %s to %s: %s",
- ifr.ifr_name, ifr.ifr_newname, strerror(errno));
- break;
- }
- dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop);
- usleep(1000 * 1000 / 20);
+ retval = ioctl(sk, SIOCSIFNAME, &ifr);
+ if (retval == 0)
+ break;
+
+ if (errno != EEXIST) {
+ err("error changing net interface name %s to %s: %s",
+ ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+ break;
}
+ dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop);
+ usleep(1000 * 1000 / 20);
}
}
goto exit;
}
- /* read current database entry, we may want to cleanup symlinks */
- udev_old = udev_device_init();
+ /* read current database entry; cleanup, if it is known device */
+ udev_old = udev_device_init(NULL);
if (udev_old != NULL) {
- if (udev_db_get_device(udev_old, udev->dev->devpath) != 0) {
+ udev_old->test_run = udev->test_run;
+ if (udev_db_get_device(udev_old, udev->dev->devpath) == 0) {
+ info("device '%s' already in database, cleanup", udev->dev->devpath);
+ udev_db_delete_device(udev_old);
+ } else {
udev_device_cleanup(udev_old);
udev_old = NULL;
- } else
- info("device '%s' already in database, validate currently present symlinks",
- udev->dev->devpath);
- }
-
- /* create node and symlinks */
- retval = udev_node_add(udev, udev_old);
- if (retval == 0) {
- /* store record in database */
- udev_db_add_device(udev);
-
- /* remove possibly left-over symlinks */
- if (udev_old != NULL) {
- struct name_entry *link_loop;
- struct name_entry *link_old_loop;
- struct name_entry *link_old_tmp_loop;
-
- /* remove still valid symlinks from old list */
- list_for_each_entry_safe(link_old_loop, link_old_tmp_loop, &udev_old->symlink_list, node)
- list_for_each_entry(link_loop, &udev->symlink_list, node)
- if (strcmp(link_old_loop->name, link_loop->name) == 0) {
- dbg("symlink '%s' still valid, keep it", link_old_loop->name);
- list_del(&link_old_loop->node);
- free(link_old_loop);
- }
- udev_node_remove_symlinks(udev_old);
- udev_device_cleanup(udev_old);
}
}
+
+ /* create node */
+ retval = udev_node_add(udev);
+ if (retval != 0)
+ goto exit;
+
+ /* store in database */
+ udev_db_add_device(udev);
+
+ /* create, replace, delete symlinks according to priority */
+ udev_node_update_symlinks(udev, udev_old);
+
+ if (udev_old != NULL)
+ udev_device_cleanup(udev_old);
goto exit;
}
info("device event will be ignored");
goto exit;
}
+ if (udev->name[0] == '\0') {
+ info("device renaming supressed");
+ goto exit;
+ }
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->dev->kernel) != 0) {
+ char devpath[PATH_MAX];
char *pos;
retval = rename_netif(udev);
/* export old name */
setenv("INTERFACE_OLD", udev->dev->kernel, 1);
- /* now fake the devpath, because the kernel name changed silently */
- pos = strrchr(udev->dev->devpath, '/');
+ /* now change the devpath, because the kernel device name has changed */
+ strlcpy(devpath, udev->dev->devpath, sizeof(devpath));
+ pos = strrchr(devpath, '/');
if (pos != NULL) {
pos[1] = '\0';
- strlcat(udev->dev->devpath, udev->name, sizeof(udev->dev->devpath));
- strlcpy(udev->dev->kernel, udev->name, sizeof(udev->dev->kernel));
+ strlcat(devpath, udev->name, sizeof(devpath));
+ sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
setenv("DEVPATH", udev->dev->devpath, 1);
setenv("INTERFACE", udev->name, 1);
+ info("changed devpath to '%s'", udev->dev->devpath);
}
}
goto exit;
if (major(udev->devt) != 0 && strcmp(udev->action, "remove") == 0) {
struct name_entry *name_loop;
- /* import and delete database entry */
+ /* import database entry, and delete it */
if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
udev_db_delete_device(udev);
if (udev->ignore_remove) {
list_for_each_entry(name_loop, &udev->env_list, node)
putenv(name_loop->name);
} else {
- dbg("'%s' not found in database, using kernel name '%s'", udev->dev->devpath, udev->dev->kernel);
+ dbg("'%s' not found in database, using kernel name '%s'",
+ udev->dev->devpath, udev->dev->kernel);
strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
}
goto exit;
}
+ /* remove the node */
retval = udev_node_remove(udev);
+
+ /* delete or restore symlinks according to priority */
+ udev_node_update_symlinks(udev, NULL);
goto exit;
}
~ianmdlvl / elogind.git / blobdiff