strcpy(udev->owner, "root");
strcpy(udev->group, "root");
+ udev->event_timeout = -1;
+
return udev;
}
return makedev(0, 0);
}
+static void kernel_log(struct ifreq ifr)
+{
+ int klog;
+ FILE *f;
+
+ klog = open("/dev/kmsg", O_WRONLY);
+ if (klog < 0)
+ return;
+
+ f = fdopen(klog, "w");
+ if (f == NULL) {
+ close(klog);
+ return;
+ }
+
+ fprintf(f, "<6>udev: renamed network interface %s to %s\n",
+ ifr.ifr_name, ifr.ifr_newname);
+ fclose(f);
+}
+
static int rename_netif(struct udevice *udev)
{
int sk;
struct ifreq ifr;
int retval;
- info("changing net interface name from '%s' to '%s'", udev->dev->kernel, udev->name);
+ info("changing net interface name from '%s' to '%s'\n", udev->dev->kernel, udev->name);
if (udev->test_run)
return 0;
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
- err("error opening socket: %s", strerror(errno));
+ err("error opening socket: %s\n", strerror(errno));
return -1;
}
strlcpy(ifr.ifr_name, udev->dev->kernel, IFNAMSIZ);
strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
retval = ioctl(sk, SIOCSIFNAME, &ifr);
- if (retval != 0) {
+ if (retval == 0)
+ kernel_log(ifr);
+ else {
int loop;
/* see if the destination interface name already exists */
if (errno != EEXIST) {
- err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+ err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
goto exit;
}
strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ);
retval = ioctl(sk, SIOCSIFNAME, &ifr);
if (retval != 0) {
- err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+ err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
goto exit;
}
loop = 30 * 20;
while (loop--) {
retval = ioctl(sk, SIOCSIFNAME, &ifr);
- if (retval == 0)
+ if (retval == 0) {
+ kernel_log(ifr);
break;
+ }
if (errno != EEXIST) {
- err("error changing net interface name %s to %s: %s",
+ err("error changing net interface name %s to %s: %s\n",
ifr.ifr_name, ifr.ifr_newname, strerror(errno));
break;
}
- dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop);
+ dbg("wait for netif '%s' to become free, loop=%i\n", udev->name, (30 * 20) - loop);
usleep(1000 * 1000 / 20);
}
}
{
int retval = 0;
+ if (udev->devpath_old != NULL)
+ if (udev_db_rename(udev->devpath_old, udev->dev->devpath) == 0)
+ info("moved database from '%s' to '%s'\n", udev->devpath_old, udev->dev->devpath);
+
/* add device node */
if (major(udev->devt) != 0 &&
(strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
struct udevice *udev_old;
- dbg("device node add '%s'", udev->dev->devpath);
+ dbg("device node add '%s'\n", udev->dev->devpath);
udev_rules_get_name(rules, udev);
if (udev->ignore_device) {
- info("device event will be ignored");
+ info("device event will be ignored\n");
goto exit;
}
if (udev->name[0] == '\0') {
- info("device node creation supressed");
+ info("device node creation supressed\n");
goto exit;
}
if (udev_old != NULL) {
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);
+ info("device '%s' already in database, cleanup\n", udev->dev->devpath);
udev_db_delete_device(udev_old);
} else {
udev_device_cleanup(udev_old);
/* add netif */
if (strcmp(udev->dev->subsystem, "net") == 0 && strcmp(udev->action, "add") == 0) {
- dbg("netif add '%s'", udev->dev->devpath);
+ dbg("netif add '%s'\n", udev->dev->devpath);
udev_rules_get_name(rules, udev);
if (udev->ignore_device) {
- info("device event will be ignored");
+ info("device event will be ignored\n");
goto exit;
}
if (udev->name[0] == '\0') {
- info("device renaming supressed");
+ info("device renaming supressed\n");
goto exit;
}
retval = rename_netif(udev);
if (retval != 0)
goto exit;
- info("renamed netif to '%s'", udev->name);
+ info("renamed netif to '%s'\n", udev->name);
/* export old name */
setenv("INTERFACE_OLD", udev->dev->kernel, 1);
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);
+ info("changed devpath to '%s'\n", udev->dev->devpath);
}
}
goto exit;
/* 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) {
- dbg("remove event for '%s' requested to be ignored by rule", udev->name);
- return 0;
- }
/* restore stored persistent data */
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'",
+ dbg("'%s' not found in database, using kernel name '%s'\n",
udev->dev->devpath, udev->dev->kernel);
strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
}
udev_rules_get_run(rules, udev);
if (udev->ignore_device) {
- info("device event will be ignored");
+ info("device event will be ignored\n");
goto exit;
}
+ if (udev->ignore_remove) {
+ info("ignore_remove for '%s'\n", udev->name);
+ goto exit;
+ }
/* remove the node */
retval = udev_node_remove(udev);
/* default devices */
udev_rules_get_run(rules, udev);
if (udev->ignore_device)
- info("device event will be ignored");
+ info("device event will be ignored\n");
exit:
return retval;