diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-26 04:35:32 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-26 04:35:32 +0100 |
| commit | c6243a414e5ea233862445db0e57d6033879985f (patch) | |
| tree | 5d4ff676db2e50efde0e4722356d32e52bb198b2 | |
| parent | 6493e655f7387a37ad6e8cb928afc1c1a5c1a454 (diff) | |
test: add RUN+="socket: ..." to a test to run monitor code
| -rwxr-xr-x | test/udev-test.pl | 4 | ||||
| -rw-r--r-- | udev/lib/libudev-device.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl index 767f6adeb4..096977a611 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -36,7 +36,7 @@ my @tests = ( devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", exp_name => "boot_disk" , rules => <<EOF -SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", NAME="boot_disk%n" +SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", NAME="boot_disk%n", RUN+="socket:@/org/kernel/udev/monitor" KERNEL=="ttyACM0", NAME="modem" EOF }, @@ -1663,7 +1663,7 @@ EOF exp_name => "sda-8741C4G-end", exp_perms => "0:0:0660", rules => <<EOF -KERNEL=="sda", NAME="%k-%s{[dmi/id]product_name}-end" +KERNEL=="sda", NAME="%k-%s{[dmi/id]product_name}-end", RUN+="socket:@/org/kernel/udev/monitor" EOF }, diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c index b8f4b8ba71..bad6e94de5 100644 --- a/udev/lib/libudev-device.c +++ b/udev/lib/libudev-device.c @@ -1079,7 +1079,7 @@ static int update_envp_monitor_buf(struct udev_device *udev_device) char **udev_device_get_properties_envp(struct udev_device *udev_device) { if (!udev_device->envp_uptodate) - if (update_envp_monitor_buf(udev_device) < 32) + if (update_envp_monitor_buf(udev_device) != 0) return NULL; return udev_device->envp; } @@ -1087,7 +1087,7 @@ char **udev_device_get_properties_envp(struct udev_device *udev_device) ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf) { if (!udev_device->envp_uptodate) - if (update_envp_monitor_buf(udev_device) < 32) + if (update_envp_monitor_buf(udev_device) != 0) return -EINVAL; *buf = udev_device->monitor_buf; return udev_device->monitor_buf_len; |