From 164963b80875b8d23062179bf2d92a9896a2a0a7 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Fri, 29 Nov 2019 15:22:56 +0100 Subject: [PATCH] package/openvmtools: use correct variable in udev rule RUN+= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit DEVPATH is not a valid substitution in a RUN+=, devpath is: https://mirrors.edge.kernel.org/pub/linux/utils/kernel/hotplug/udev/udev.html So use that to get rid of the following warning: Invalid value "/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" for RUN (char 27: invalid substitution type), ignoring, but please fix Source: https://github.com/vmware/open-vm-tools/pull/376 Signed-off-by: Pascal de Bruijn Acked-by: Jérémy Rosen [Peter: extend description] Signed-off-by: Peter Korsgaard --- .../0010-Change-DEVPATH-to-devpath.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package/openvmtools/0010-Change-DEVPATH-to-devpath.patch diff --git a/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch b/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch new file mode 100644 index 0000000000..5af694d8f2 --- /dev/null +++ b/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch @@ -0,0 +1,25 @@ +From 22f5d198b3b2f7e4debed83948ba1baf70d4749a Mon Sep 17 00:00:00 2001 +From: puneetse <22071208+puneetse@users.noreply.github.com> +Date: Wed, 16 Oct 2019 10:04:41 -0700 +Subject: [PATCH] Change $DEVPATH to $devpath + +$DEVPATH throws a warning by udev. + +Signed-off-by: Pascal de Bruijn +--- + udev/99-vmware-scsi-udev.rules | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/udev/99-vmware-scsi-udev.rules b/udev/99-vmware-scsi-udev.rules +index 053b59706..a605d80ef 100644 +--- a/udev/99-vmware-scsi-udev.rules ++++ b/udev/99-vmware-scsi-udev.rules +@@ -2,6 +2,6 @@ + # + # This file is part of open-vm-tools + +-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'" ++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'" + -- 2.30.2