Hello community, here is the log from the commit of package udev checked in at Thu Sep 13 18:59:21 CEST 2007. -------- --- udev/udev.changes 2007-09-06 12:07:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2007-09-12 16:21:42.021170000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 12 00:28:01 CEST 2007 - kay.sievers@novell.com + +- ignore device node names while restoring symlinks (nbz#309294) +- remove rtc from /lib/udev/devices (device no longer in the kernel) + +------------------------------------------------------------------- New: ---- udev-do-not-replace-node-by-symlink.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.l25349/_old 2007-09-13 18:59:14.000000000 +0200 +++ /var/tmp/diff_new_pack.l25349/_new 2007-09-13 18:59:14.000000000 +0200 @@ -13,7 +13,7 @@ Name: udev URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Version: 114 -Release: 11 +Release: 14 License: GPL v2 or later Group: System/Kernel Summary: A Rule-Based Device Node and Kernel Event Manager @@ -35,6 +35,7 @@ Patch3: udev-pers-net-rules.fix.patch Patch4: udev-wait-for-sysfs-10s.patch Patch5: udev-rtc-nodes.patch +Patch6: udev-do-not-replace-node-by-symlink.patch %description udev's main task is to create and remove device nodes in /dev when a @@ -88,6 +89,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build # prevent man pages from re-building (xmlto) @@ -210,7 +212,6 @@ %attr(600,root,root) %dev(c,1,11) /lib/udev/devices/kmsg %attr(666,root,root) %dev(c,1,3) /lib/udev/devices/null %attr(666,root,root) %dev(c,1,5) /lib/udev/devices/zero -%attr(600,root,root) %dev(c,10,135) /lib/udev/devices/rtc %attr(666,root,tty) %dev(c,5,2) /lib/udev/devices/ptmx %attr(666,root,tty) %dev(c,5,0) /lib/udev/devices/tty %attr(620,root,tty) %dev(c,4,1) /lib/udev/devices/tty1 @@ -246,6 +247,9 @@ /%{_lib}/libvolume_id.so.* %changelog +* Wed Sep 12 2007 - kay.sievers@novell.com +- ignore device node names while restoring symlinks (nbz#309294) +- remove rtc from /lib/udev/devices (device no longer in the kernel) * Thu Sep 06 2007 - kay.sievers@suse.de - add realtime clock nodes (nbz#287539) * Wed Aug 22 2007 - kay.sievers@suse.de ++++++ udev-do-not-replace-node-by-symlink.patch ++++++ diff --git a/udev_node.c b/udev_node.c index 25eed86..556a442 100644 --- a/udev_node.c +++ b/udev_node.c @@ -230,11 +230,15 @@ static int update_link(struct udevice *udev, const char *name) if (udev_db == NULL) continue; if (udev_db_get_device(udev_db, device->name) == 0) { - info("compare priority of '%s' %i > %i", - udev_db->dev->devpath, udev_db->link_priority, priority); - if (target[0] == '\0' || udev_db->link_priority > priority) { - priority = udev_db->link_priority; - strlcpy(target, udev_db->name, sizeof(target)); + if (strcmp(udev_db->name, name) == 0) { + info("'%s' is a device node of '%s', skip link update", udev_db->name, device->name); + } else { + info("compare priority of '%s' %i > %i", + udev_db->dev->devpath, udev_db->link_priority, priority); + if (target[0] == '\0' || udev_db->link_priority > priority) { + priority = udev_db->link_priority; + strlcpy(target, udev_db->name, sizeof(target)); + } } } udev_device_cleanup(udev_db); @@ -242,8 +246,8 @@ static int update_link(struct udevice *udev, const char *name) name_list_cleanup(&name_list); if (target[0] == '\0') { - err("missing target for '%s'", name); - rc = -1; + info("no current target for '%s' found", name); + rc = 1; goto out; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org