chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevd: create /dev/.udev/rules.d/ before watching it wit inotify
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index 7b4e4ac5c3cf892224067e9e99c714534539634c..d5b4d0941e295f1d1a18fb97a879a7b04a00edc2 100644
(file)
--- a/
udev/udev-event.c
+++ b/
udev/udev-event.c
@@
-492,8
+492,7
@@
static int rename_netif(struct udev_event *event)
}
/* free our own name, another process may wait for us */
}
/* free our own name, another process may wait for us */
- util_strscpy(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev));
- util_strscpy(ifr.ifr_newname, IFNAMSIZ, "_rename");
+ util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "_rename", NULL);
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err != 0) {
err(event->udev, "error changing netif name %s to %s: %m\n",
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err != 0) {
err(event->udev, "error changing netif name %s to %s: %m\n",
@@
-688,9
+687,9
@@
exit_add:
char devnode[UTIL_PATH_SIZE];
info(event->udev, "'%s' not found in database, using kernel name '%s'\n",
char devnode[UTIL_PATH_SIZE];
info(event->udev, "'%s' not found in database, using kernel name '%s'\n",
- udev_device_get_syspath(dev), udev_device_get_
sys
name(dev));
+ udev_device_get_syspath(dev), udev_device_get_
knode
name(dev));
util_strscpyl(devnode, sizeof(devnode),
util_strscpyl(devnode, sizeof(devnode),
- udev_get_dev_path(event->udev), "/", udev_device_get_
sys
name(dev), NULL);
+ udev_get_dev_path(event->udev), "/", udev_device_get_
knode
name(dev), NULL);
udev_device_set_devnode(dev, devnode);
}
udev_device_set_devnode(dev, devnode);
}