summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2005-08-11 21:01:46 +0200
committerKay Sievers <kay.sievers@suse.de>2005-08-11 21:01:46 +0200
commit4937afa402bf142429f0ac6dfc7e1bf8172faa62 (patch)
tree98430103a3e7853a833f2d8bede26e672bbec2f5
parent2b996ad19339858ab702c27c9976581ca6784628 (diff)
move some logging to the info level
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
-rw-r--r--etc/udev/suse/udev.rules2
-rw-r--r--udev.c1
-rw-r--r--udev_rules.c6
3 files changed, 5 insertions, 4 deletions
diff --git a/etc/udev/suse/udev.rules b/etc/udev/suse/udev.rules
index b0c1f1adcb..0e3d06817a 100644
--- a/etc/udev/suse/udev.rules
+++ b/etc/udev/suse/udev.rules
@@ -234,7 +234,7 @@ SUBSYSTEM=="net", ACTION=="remove", RUN+="/sbin/ifdown %k -o hotplug"
# libusb device access (mount usbfs or usbdev nodes)
DEVPATH=="/module/usbcore", ACTION=="add", RUN+="/bin/mount -t usbfs usbfs /proc/bus/usb"
-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 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
# firmware loader
SUBSYSTEM=="firmware", ACTION=="add", RUN+="/etc/hotplug.d/firmware/50-firmware.hotplug"
diff --git a/udev.c b/udev.c
index d50f81ea5e..f0b2800a91 100644
--- a/udev.c
+++ b/udev.c
@@ -125,6 +125,7 @@ int main(int argc, char *argv[], char *envp[])
dbg("executing run list");
list_for_each_entry(name_loop, &udev.run_list, node) {
+ info("RUN key executes '%s'", name_loop->name);
if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, action);
else
diff --git a/udev_rules.c b/udev_rules.c
index 8587b02549..40c010c63f 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -808,7 +808,7 @@ try_parent:
apply_format(udev, import, sizeof(import), class_dev, sysfs_device);
dbg("check for IMPORT import='%s'", import);
if (rule->import_type == IMPORT_PROGRAM) {
- dbg("run executable file import='%s'", import);
+ info("IMPORT executes '%s'", import);
rc = import_program_into_env(udev, import);
} else if (rule->import_type == IMPORT_FILE) {
dbg("import file import='%s'", import);
@@ -833,7 +833,7 @@ try_parent:
strlcpy(program, key_val(rule, &rule->program), sizeof(program));
apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
- dbg("check for PROGRAM program='%s", program);
+ info("PROGRAM key executes '%s", program);
if (run_program(program, udev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_DEBUG)) != 0) {
dbg("PROGRAM is false");
udev->program_result[0] = '\0';
@@ -1033,7 +1033,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev, struct s
if (!name_set) {
strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
- info("no rule found, will use kernel name '%s'", udev->name);
+ info("no node name set, will use kernel name '%s'", udev->name);
}
if (udev->tmp_node[0] != '\0') {