Skip to content

Commit

Permalink
open-vm-tools: use ENV{DEVTYPE}=="disk" in udev scsi rule
Browse files Browse the repository at this point in the history
Fix udev scsi rule to not print warnings on boot.
The rule now checks for the device type. The previous fix by
trying to check for a valid timeout field did not work as expected.
This change uses the rule from Mike Latimer at
#216
  • Loading branch information
oliverkurth committed Feb 7, 2018
1 parent 9da6562 commit 3011466
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions open-vm-tools/AUTHORS
Expand Up @@ -19,3 +19,7 @@ Andrew Stormont Fix finding C++ compiler for cross-compiling

Josh Paetzel Fix compilation error in clang 6.0
- https://github.com/vmware/open-vm-tools/pull/221

Mike Latimer Restrict udev rules to disk devices only
- https://github.com/vmware/open-vm-tools/pull/216

4 changes: 2 additions & 2 deletions open-vm-tools/udev/99-vmware-scsi-udev.rules
Expand Up @@ -2,6 +2,6 @@
#
# This file is part of open-vm-tools

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'"
ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"

0 comments on commit 3011466

Please sign in to comment.