summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2005-12-04 01:48:53 +0100
committerKay Sievers <kay.sievers@suse.de>2005-12-04 01:48:53 +0100
commita2f87fddbfcb81f6f8f254b1a986a18f444212cf (patch)
tree5ab252333de7a29243e3bfdd36c279f275c9eb70
parentaab4c0eebef44c5b67d4c9537f1c5149de3ca9c2 (diff)
update SUSE rules
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
-rw-r--r--Makefile1
-rw-r--r--etc/udev/suse/50-udev.rules14
-rw-r--r--etc/udev/suse/90-hal.rules2
-rw-r--r--udevd.c4
4 files changed, 8 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 48a130491e..5995b57697 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,6 @@ GEN_CONFIGS = \
GEN_HEADERS = \
udev_version.h
-# override this to make udev look in a different location for it's config files
prefix =
etcdir = ${prefix}/etc
sbindir = ${prefix}/sbin
diff --git a/etc/udev/suse/50-udev.rules b/etc/udev/suse/50-udev.rules
index 768fdf0acb..51561ffd0f 100644
--- a/etc/udev/suse/50-udev.rules
+++ b/etc/udev/suse/50-udev.rules
@@ -37,7 +37,7 @@ KERNEL=="vbi0", SYMLINK+="vbi"
KERNEL=="pmu", GROUP="video"
# dvb
-SUBSYSTEM="dvb", PROGRAM="/bin/sh -c 'X=%k; X=$${X#dvb}; A=$${X%%%%.*}; D=$${X#*.}; echo dvb/adapter$$A/$$D'", NAME="%c", GROUP="video"
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
# Kino jogshuttle support
SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="b33/10/*", RUN+="/usr/bin/killall --quiet -USR2 kino"
@@ -51,8 +51,7 @@ KERNEL=="js*", NAME="input/%k", MODE="0644"
KERNEL=="ts*", NAME="input/%k", MODE="0600"
KERNEL=="uinput", NAME="input/%k", MODE="0600"
KERNEL=="lirc0", NAME="%k", SYMLINK+="lirc"
-KERNEL=="input[0-9]*", RUN+="/lib/udev/input_device.sh"
-KERNEL=="input[0-9]*", ACTION=="add", ENV{ABS}=="[1-9]*", RUN+="/sbin/modprobe joydev"
+KERNEL=="input[0-9]*", ACTION=="add", RUN+="/lib/udev/input.sh"
# printer
SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
@@ -121,14 +120,13 @@ SUBSYSTEM=="block", GROUP="disk", MODE="0640"
ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="0|7|14", RUN+="/bin/sh -c 'echo 60 > /sys/$DEVPATH/timeout'"
ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", RUN+="/bin/sh -c 'echo 900 > /sys/$DEVPATH/timeout'"
SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{device/type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
-# Treat osst as a unique case, that is, osst will load more often than
-SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{device/type}=="1", SYSFS{device/vendor}=="OnStream", RUN+="/sbin/modprobe osst"
+SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{device/type}=="1", SYSFS{device/vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{device/type}=="1", RUN+="/sbin/modprobe st"
SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{device/type}=="[45]", RUN+="/sbin/modprobe sr_mod"
SUBSYSTEM=="scsi_device", ACTION=="add", RUN+="/sbin/modprobe sg"
-# IDE/ATAPI handling
-SUBSYSTEM=="ide", ACTION=="add", RUN+="/lib/udev/load_ide_modules.sh"
+# IDE modules
+SUBSYSTEM=="ide", ACTION=="add", RUN+="/lib/udev/ide.sh"
# device mapper
KERNEL=="device-mapper", ACTION=="add", NAME="%k", SYMLINK+="mapper/control"
@@ -161,7 +159,7 @@ KERNEL=="iseries/nvt*", NAME="%k", GROUP="disk"
KERNEL=="iseries/ibmsis*", NAME="%k", GROUP="disk"
# libusb device access
-SUBSYSTEM="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
# firmware loader
SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware.sh"
diff --git a/etc/udev/suse/90-hal.rules b/etc/udev/suse/90-hal.rules
index 9b2fe79ea5..b0b36330df 100644
--- a/etc/udev/suse/90-hal.rules
+++ b/etc/udev/suse/90-hal.rules
@@ -1,3 +1 @@
-# send all events to HAL
-
RUN+="socket:/org/freedesktop/hal/udev_event"
diff --git a/udevd.c b/udevd.c
index b87fe56413..ff61c656c8 100644
--- a/udevd.c
+++ b/udevd.c
@@ -551,7 +551,7 @@ static struct uevent_msg *get_udevd_msg(void)
size = recvmsg(udevd_sock, &smsg, 0);
if (size < 0) {
if (errno != EINTR)
- err("unable to receive udevd message: %s", strerror(errno));
+ err("unable to receive user udevd message: %s", strerror(errno));
return NULL;
}
cmsg = CMSG_FIRSTHDR(&smsg);
@@ -626,7 +626,7 @@ static struct uevent_msg *get_netlink_msg(void)
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
if (size < 0) {
if (errno != EINTR)
- err("unable to receive udevd message: %s", strerror(errno));
+ err("unable to receive kernel netlink message: %s", strerror(errno));
return NULL;
}