From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:42 +0000 (-0700)
Subject: Check timeout setting for scsi device before setting
X-Git-Tag: stable-10.2.0~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94028b39e929b162ebc320f455fb2f5b3af53f04;p=thirdparty%2Fopen-vm-tools.git

Check timeout setting for scsi device before setting

The rule to set the timeout value for SCSI devices was too generic,
and caused error messages, when the timeout field was set
when it didn't exist. This is not harmful, but generates unnecessary
noise. This change adds a check if the timeout field exists.
---

diff --git a/open-vm-tools/udev/99-vmware-scsi-udev.rules b/open-vm-tools/udev/99-vmware-scsi-udev.rules
index 896354203..fa1f9e011 100644
--- a/open-vm-tools/udev/99-vmware-scsi-udev.rules
+++ b/open-vm-tools/udev/99-vmware-scsi-udev.rules
@@ -1,3 +1,3 @@
-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*" , ATTRS{model}=="Virtual disk*", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
-ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*" , ATTRS{model}=="VMware Virtual S", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{timeout}=="?*", ATTRS{model}=="Virtual disk*", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/timeout'"
+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{timeout}=="?*", ATTRS{model}=="VMware Virtual S", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/timeout'"