Hello community, here is the log from the commit of package udev checked in at Fri Aug 31 16:04:29 CEST 2007. -------- --- udev/udev.changes 2007-08-16 15:39:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2007-08-31 10:35:54.660350000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 22 01:03:55 CEST 2007 - kay.sievers@suse.de + +- fix wrong logic of DRIVER in persistent net rules + (vmware creates multiple rules for the same device) +- increase timeout for WAIT_FOR_SYSFS to 10 seconds (nbz#306305) + +------------------------------------------------------------------- New: ---- udev-pers-net-rules.fix.patch udev-wait-for-sysfs-10s.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.E24761/_old 2007-08-31 16:03:37.000000000 +0200 +++ /var/tmp/diff_new_pack.E24761/_new 2007-08-31 16:03:37.000000000 +0200 @@ -13,7 +13,7 @@ Name: udev URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Version: 114 -Release: 5 +Release: 9 License: GPL v2 or later Group: System/Kernel Summary: A Rule-Based Device Node and Kernel Event Manager @@ -32,6 +32,8 @@ #Patch0: udev-git-HEAD.patch Patch1: volume_id-sqashfs.patch Patch2: udev-rules.patch +Patch3: udev-pers-net-rules.fix.patch +Patch4: udev-wait-for-sysfs-10s.patch %description udev's main task is to create and remove device nodes in /dev when a @@ -82,6 +84,8 @@ #%patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build # prevent man pages from re-building (xmlto) @@ -240,6 +244,10 @@ /%{_lib}/libvolume_id.so.* %changelog +* Wed Aug 22 2007 - kay.sievers@suse.de +- fix wrong logic of DRIVER in persistent net rules + (vmware creates multiple rules for the same device) +- increase timeout for WAIT_FOR_SYSFS to 10 seconds (nbz#306305) * Mon Aug 13 2007 - kay.sievers@suse.de - /dev/net/tun is 0666, also when module is not loaded - fix squashfs detection (nbz#300942) ++++++ udev-pers-net-rules.fix.patch ++++++ diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules index cfb13f1..f88627d 100644 --- a/extras/rule_generator/75-persistent-net-generator.rules +++ b/extras/rule_generator/75-persistent-net-generator.rules @@ -22,12 +22,12 @@ SUBSYSTEMS=="ccwgroup", ENV{COMMENT}="S/390 $driver device at $id", ENV{NETDEV}= SUBSYSTEMS=="ieee1394", ENV{COMMENT}="Firewire device $attr{host_id})" ENV{COMMENT}=="", ENV{COMMENT}="$env{SUBSYSTEM} device ($driver)" -DRIVERS!="?*", ENV{NETDEV}=="?*", IMPORT{program}="write_net_rules --driver $env{NETDRV} --id $env{NETDEV}" +DRIVERS=="?*", ENV{NETDEV}=="?*", IMPORT{program}="write_net_rules --driver $env{NETDRV} --id $env{NETDEV}" # skip "locally administered" MAC addresses ATTR{address}=="?[2367abef]:*", GOTO="persistent_net_generator_end" -DRIVERS!="?*", ENV{NETDEV}!="?*", IMPORT{program}="write_net_rules $attr{address}" +DRIVERS=="?*", ENV{NETDEV}!="?*", IMPORT{program}="write_net_rules $attr{address}" ENV{INTERFACE_NEW}=="?*", NAME="$env{INTERFACE_NEW}" LABEL="persistent_net_generator_end" ++++++ udev-wait-for-sysfs-10s.patch ++++++ diff --git a/udev_rules.c b/udev_rules.c index ef352ca..dcd0914 100644 --- a/udev_rules.c +++ b/udev_rules.c @@ -1040,7 +1040,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule) if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) { int found; - found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0); + found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 10) == 0); if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) goto nomatch; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org