picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test: add RUN+="socket: ..." to a test to run monitor code

Browse source
This commit is contained in:
Kay Sievers 2008-10-26 04:35:32 +01:00
parent 6493e655f7
commit c6243a414e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/udev-test.pl
View file

@ -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
},

4
udev/lib/libudev-device.c
View file

@ -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;