diff --git a/SOURCES/ovt-Ignore-ENXIO-errors-with-SyncDriver.patch b/SOURCES/ovt-Ignore-ENXIO-errors-with-SyncDriver.patch new file mode 100644 index 0000000..601998b --- /dev/null +++ b/SOURCES/ovt-Ignore-ENXIO-errors-with-SyncDriver.patch @@ -0,0 +1,62 @@ +From ebc8bf4a58f7f65dbb7e7b2e1152322159faa228 Mon Sep 17 00:00:00 2001 +From: Cathy Avery +Date: Fri, 1 Jun 2018 15:58:51 +0200 +Subject: [PATCH] Ignore ENXIO errors with SyncDriver + +RH-Author: Cathy Avery +Message-id: <20180601155851.7526-1-cavery@redhat.com> +Patchwork-id: 80546 +O-Subject: [RHEL7.5.z open-vm-tools PATCH] Ignore ENXIO errors with SyncDriver +Bugzilla: 1582123 +RH-Acked-by: Richard Jones +RH-Acked-by: Mohammed Gamal +RH-Acked-by: Eduardo Otubo + +A quiesced snapshot fails when the target VM has a bind mount. The +problem is that the syncDriver gets an ENXIO error when it tries to +open the mount point. To fix the problem, let the quiesce operation +skip a mount point when opening it results in an ENXIO error. + +This change is based on pull request +https://github.com/vmware/open-vm-tools/pull/218 . + +Signed-off-by: Miroslav Rezanina + +Conflicts: + open-vm-tools/AUTHORS version 10.1.10 is empty. + +(cherry picked from commit 6559b7dfd9f6f40c2df76e1b1e785fa3eb1c1da4) +Signed-off-by: Cathy Avery +--- + lib/syncDriver/syncDriverLinux.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/open-vm-tools/lib/syncDriver/syncDriverLinux.c b/open-vm-tools/lib/syncDriver/syncDriverLinux.c +index da0a8cb..4422729 100644 +--- a/lib/syncDriver/syncDriverLinux.c ++++ b/lib/syncDriver/syncDriverLinux.c +@@ -1,5 +1,5 @@ + /********************************************************* +- * Copyright (C) 2011-2017 VMware, Inc. All rights reserved. ++ * Copyright (C) 2011-2018 VMware, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published +@@ -195,6 +195,14 @@ LinuxDriver_Freeze(const GSList *paths, + Debug(LGPFX "cannot access mounted directory '%s'.\n", path); + continue; + ++ case ENXIO: ++ /* ++ * A bind-mounted file, such as a mount of /dev/log for a ++ * chrooted application, will land us here. Just skip it. ++ */ ++ Debug(LGPFX "no such device or address '%s'.\n", path); ++ continue; ++ + case EIO: + /* + * A mounted HGFS filesystem with the backend disabled will give +-- +1.8.3.1 + diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec index b229b06..ad07aee 100644 --- a/SPECS/open-vm-tools.spec +++ b/SPECS/open-vm-tools.spec @@ -28,7 +28,7 @@ Name: open-vm-tools Version: %{toolsversion} -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Group: Applications/System License: GPLv2 @@ -44,6 +44,7 @@ ExclusiveArch: %{ix86} x86_64 Patch1: resolutionKMS-wayland.patch Patch2: resolutionKMS-wayland-2.patch +Patch3: ovt-Ignore-ENXIO-errors-with-SyncDriver.patch BuildRequires: autoconf BuildRequires: automake @@ -132,6 +133,7 @@ VMware virtual machines. %setup -q -n %{name}-%{version}-%{toolsbuild} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Required for regenerating configure script when @@ -302,6 +304,10 @@ fi %{_libdir}/libvmtools.so %changelog +* Tue Jun 05 2018 Miroslav Rezanina - 10.1010-3.1 +- Ignore ENXIO errors with SyncDriver + resolves: rhbz#1582123 + * Tue Oct 03 2017 Richard W.M. Jones - 10.1.10-3 - New upstream version 10.1.10 resolves: rhbz#1475608