update SUSE rules

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/etc/udev/suse/udev.rules b/etc/udev/suse/udev.rules
index 8791e42fc7d61844888cb33e455c3090ba6134ec..b0c1f1adcb738959c4b6dcf99e41459b9bf25e7b 100644 (file)
--- a/etc/udev/suse/udev.rules
+++ b/etc/udev/suse/udev.rules
@@ -46,7 +46,7 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8006/*", RUN+="/sbin/fxload
 SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8001/*", RUN+="/sbin/startproc /usr/bin/us428control"
 SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8005/*", RUN+="/sbin/startproc /usr/bin/us428control"
 SUBSYSTEM=="sound", KERNEL=="controlC?", RUN+="/usr/sbin/alsactl -F restore %n"
-SUBSYSTEM=="sound", KERNEL=="hwC?D2", DRIVER=="EMU10K1_Audigy", RUN+="/etc/dev.d/snd/hwC0D2/alsa"
+SUBSYSTEM=="sound", KERNEL=="hwC?D2", DRIVER=="EMU10K1_Audigy", RUN+="/etc/alsa.d/udev-soundfont"
 
 # OpenCT (SmartCard)
 SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="973/1*", RUN+="/usr/sbin/openct-control attach $env{DEVICE} usb:$env{PRODUCT}"
@@ -221,7 +221,8 @@ KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="$env{ID_TYPE}/by-path/$env{ID_PA
 # by-label/by-uuid (filesystem properties)
 KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_end"
 KERNEL=="sr*", GOTO="persistent_end"
-IMPORT="/sbin/vol_id --export $tempnode"
+KERNEL=="*[0-9]", IMPORT="/sbin/vol_id --export $tempnode"
+KERNEL=="*[!0-9]", SYSFS{range}=="[1-9]*", IMPORT="/sbin/vol_id --export $tempnode"
 ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
 ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 LABEL="persistent_end"

diff --git a/udevstart.c b/udevstart.c
index 4288db9d38177d59ddd28d9ca1def572539bc1a2..23a13e08ff319f8950fa0318c7623e91234bcadc 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -315,10 +315,7 @@ static void udev_scan_class(void)
                                        snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
                                        dirname2[sizeof(dirname2)-1] = '\0';
 
-                                       /* pass the net class as it is */
-                                       if (strcmp(dent->d_name, "net") == 0)
-                                               device_list_insert(dirname2, "net", &device_list);
-                                       else if (has_devt(dirname2))
+                                       if (has_devt(dirname2) || strcmp(dent->d_name, "net") == 0)
                                                device_list_insert(dirname2, dent->d_name, &device_list);
                                }
                                closedir(dir2);