--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package open-vm-tools
Together with the people from VMware and Canonical two bugs that were
mainly race conditions on boot time.
- ensure the vmwgfx is being loaded before vmtoolsd is run
- ensure vgauth is started before vmtoolsd
a third patch is an Ubuntu-only change and does not affect Debian at
all.
Patch series is attached.
Thanks a lot,
Bernd
unblock open-vm-tools/2:10.3.5-8
--
Bernd Zeimetz Debian GNU/Linux Developer
http://bzed.de http://www.debian.org
GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
>From 71b468f7f855139adfc8cd48cc0f63167d01b9bb Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 4 Mar 2019 09:30:57 +0100
Subject: [PATCH 1/5] make vgauth service execution more reliable
Since d3d47039 "Start vgauth before vmtoolsd" there is a potential race
of starting vgauth so early that it might have issues. This was
discussed back in the day in [1] to [2], but confirmed to be ok by
VMWare.
We were all somewhat convinced by this, but a bad feeling remained not
only with me but also with Bernd [4].
A recent SRU review denial made me rethink all of it and I think we can
make it safer without thwarting the purpose of the original change.
Note: Disambiguation of service names used below:
vgauth - open-vm-tools.vgauth.service
vmtoolsd - open-vm-tools.service
fs - systemd-remount-fs.service
tmp - systemd-tmpfiles-setup.service
cloud-init - cloud-init-local.service
Currently we have these dependency requirements:
- vgauth should be before vmtoolsd
- cloud init should be before vmtoolsd
- cloud init has to be really early in general
- therefore this is using DefaultDependencies=No
That lead to this graph:
fs / tmp -> vmtoolsd -> cloud-init
And d3d47039 added it to be like:
fs / tmp -> vmtoolsd -> cloud-init
^
vgauth --|
But there is no need to have vgauth without any pre-dependencies at all.
It is only needed to be "before" vmtoolsd, therefore we can make it:
fs / tmp -> vgauth -> vmtoolsd -> cloud-init
That will make execution of vgauth much less error-prone (even though I
have no hard issue to report) while at the same time holding up all
known required ordering constraints.
[1]: https://bugs.launchpad.net/ubuntu/+source/open-vm-tools/+bug/1804287/comments/3
[2]: https://bugs.launchpad.net/ubuntu/+source/open-vm-tools/+bug/1804287/comments/12
[3]: https://bugs.launchpad.net/ubuntu/+source/open-vm-tools/+bug/1804287/comments/25
[4]: https://github.com/bzed/pkg-open-vm-tools/pull/15#issuecomment-447237910
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
debian/open-vm-tools.vgauth.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/open-vm-tools.vgauth.service b/debian/open-vm-tools.vgauth.service
index af538a6a..86f03f22 100644
--- a/debian/open-vm-tools.vgauth.service
+++ b/debian/open-vm-tools.vgauth.service
@@ -3,6 +3,7 @@ Description=Authentication service for virtual machines hosted on VMware
Documentation=http://github.com/vmware/open-vm-tools
ConditionVirtualization=vmware
DefaultDependencies=no
+After=systemd-remount-fs.service systemd-tmpfiles-setup.service
PartOf=open-vm-tools.service
[Service]
--
2.20.1
>From e1198113a6cf0d5c952b57c748b266bdd6b6c1f0 Mon Sep 17 00:00:00 2001
From: Bernd Zeimetz <bernd@bzed.de>
Date: Mon, 4 Mar 2019 20:03:56 +0100
Subject: [PATCH 2/5] Updating changelog
---
debian/changelog | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c611227f..d7ffa8bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+open-vm-tools (2:10.3.5-7) unstable; urgency=medium
+
+ [ Christian Ehrhardt ]
+ * [71b468f] make vgauth service execution more reliable.
+ Since d3d47039 "Start vgauth before vmtoolsd" there is a potential race
+ of starting vgauth so early that it might have issues. This was
+ discussed back in the day in [1] to [2], but confirmed to be ok by
+ VMWare.
+ We were all somewhat convinced by this, but a bad feeling remained not
+ only with me but also with Bernd [4].
+ A recent SRU review denial made me rethink all of it and I think we can
+ make it safer without thwarting the purpose of the original change.
+ Note: Disambiguation of service names used below:
+ vgauth - open-vm-tools.vgauth.service
+ vmtoolsd - open-vm-tools.service
+ fs - systemd-remount-fs.service
+ tmp - systemd-tmpfiles-setup.service
+ cloud-init - cloud-init-local.service
+ Currently we have these dependency requirements:
+ - vgauth should be before vmtoolsd
+ - cloud init should be before vmtoolsd
+ - cloud init has to be really early in general
+ - therefore this is using DefaultDependencies=No
+ That lead to this graph:
+ fs / tmp -> vmtoolsd -> cloud-init
+ And d3d47039 added it to be like:
+ fs / tmp -> vmtoolsd -> cloud-init
+ ^
+ vgauth --|
+ But there is no need to have vgauth without any pre-dependencies at all.
+ It is only needed to be "before" vmtoolsd, therefore we can make it:
+ fs / tmp -> vgauth -> vmtoolsd -> cloud-init
+ That will make execution of vgauth much less error-prone (even though I
+ have no hard issue to report) while at the same time holding up all
+ known required ordering constraints.
+ [1]: https://bugs.launchpad.net/ubuntu/+source/open-vm-tools/+bug/1804287/comments/3
+ [2]: https://bugs.launchpad.net/ubuntu/+source/open-vm-tools/+bug/1804287/comments/12
+ [3]: https://bugs.launchpad.net/ubuntu/+source/open-vm-tools/+bug/1804287/comments/25
+ [4]: https://github.com/bzed/pkg-open-vm-tools/pull/15#issuecomment-447237910
+ Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+
+ -- Bernd Zeimetz <bzed@debian.org> Mon, 04 Mar 2019 20:02:52 +0100
+
open-vm-tools (2:10.3.5-6) unstable; urgency=medium
* [43ec618] Correct and/or improve handling of certain quiesced
--
2.20.1
>From 0f35aee402882aa7420cd6874e2944765c797dff Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
Date: Tue, 12 Mar 2019 08:10:00 +0100
Subject: [PATCH 3/5] Add modaliases to open-vm-tools-desktop
Added Modaliases to open-vm-tools-desktop to auto-discover and
auto-install the driver on Ubuntu via ubuntu-drivers. The driver is then
installed at installation time and available on first boot for an
improved user experience (LP: #1819207)
---
debian/control | 1 +
debian/rules | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/debian/control b/debian/control
index 7e1e3d81..11b0b7ce 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Recommends:
xauth, xserver-xorg-input-vmmouse,
xserver-xorg-video-vmware
Suggests: xdg-utils
+XB-Modaliases: ${modaliases}
Description: Open VMware Tools for virtual machines hosted on VMware (GUI)
The Open Virtual Machine Tools (open-vm-tools) project is an open source
implementation of VMware Tools. It is a suite of virtualization utilities and
diff --git a/debian/rules b/debian/rules
index 5062e63b..62a68cef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,12 @@
DEBHELPER_VERSION = $(strip $(shell dpkg-query -f '$${Version}' -W debhelper))
DEBHELPER_SYSTEMD_OK = $(strip $(shell dpkg --compare-versions $(DEBHELPER_VERSION) ge 10.9.1~; echo $$?))
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+ VENDOR := UBUNTU
+else
+ VENDOR := DEBIAN
+endif
+
%:
dh ${@} --sourcedirectory=open-vm-tools
@@ -71,6 +77,13 @@ override_dh_auto_install:
mkdir -p debian/open-vm-tools-desktop/lib/systemd/system/open-vm-tools.service.d
cp debian/desktop.conf debian/open-vm-tools-desktop/lib/systemd/system/open-vm-tools.service.d/
+override_dh_gencontrol:
+ if [ "${VENDOR}" = "UBUNTU" ]; \
+ then \
+ dh_gencontrol -- -Vmodaliases="vmwgfx(pci:v000015ADd00000405sv*sd*bc*sc*i*)"; \
+ else \
+ dh_gencontrol; \
+ fi
override_dh_builddeb:
dh_builddeb -- -Zxz
--
2.20.1
>From dc4e1cefe69c78a70ce322ed6b520b7c0551fcb1 Mon Sep 17 00:00:00 2001
From: Bernd Zeimetz <bernd@bzed.de>
Date: Wed, 13 Mar 2019 20:25:32 +0100
Subject: [PATCH 4/5] Load vmwgfx module before vmtoolsd starts.
As discussed on github in vmware/open-vm-tools#214
we need to load the vmwgfx module before starting vmtoolsd
for desktop users. Otherwise it is not able to retrieve the KMS
resolutions and resizing the VM desktop fails.
Closes: #924518
Thanks: @thomashvmw @rhertzog
---
debian/local/open-vm-tools-desktop.conf | 1 +
debian/open-vm-tools.service | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/local/open-vm-tools-desktop.conf b/debian/local/open-vm-tools-desktop.conf
index a517c488..a3b234c2 100644
--- a/debian/local/open-vm-tools-desktop.conf
+++ b/debian/local/open-vm-tools-desktop.conf
@@ -1 +1,2 @@
fuse
+vmwgfx
diff --git a/debian/open-vm-tools.service b/debian/open-vm-tools.service
index 2aa29f88..3c04ae3e 100644
--- a/debian/open-vm-tools.service
+++ b/debian/open-vm-tools.service
@@ -7,7 +7,7 @@ Before=cloud-init-local.service
After=vgauth.service
After=apparmor.service
RequiresMountsFor=/tmp
-After=systemd-remount-fs.service systemd-tmpfiles-setup.service
+After=systemd-remount-fs.service systemd-tmpfiles-setup.service systemd-modules-load.service
[Service]
ExecStart=/usr/bin/vmtoolsd
--
2.20.1
>From bf71fe515e8c94cccf48d2da6acab18e7a3750a7 Mon Sep 17 00:00:00 2001
From: Bernd Zeimetz <bernd@bzed.de>
Date: Wed, 13 Mar 2019 22:15:45 +0100
Subject: [PATCH 5/5] Updating changelog
---
debian/changelog | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index d7ffa8bb..eac01324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+open-vm-tools (2:10.3.5-8) unstable; urgency=medium
+
+ [ Jean-Baptiste Lallement ]
+ * [0f35aee] Add modaliases to open-vm-tools-desktop.
+ Added Modaliases to open-vm-tools-desktop to auto-discover and
+ auto-install the driver on Ubuntu via ubuntu-drivers. The driver is then
+ installed at installation time and available on first boot for an
+ improved user experience (LP: #1819207)
+
+ [ Bernd Zeimetz ]
+ * [dc4e1ce] Load vmwgfx module before vmtoolsd starts.
+ As discussed on github in vmware/open-vm-tools#214
+ we need to load the vmwgfx module before starting vmtoolsd
+ for desktop users. Otherwise it is not able to retrieve the KMS
+ resolutions and resizing the VM desktop fails.
+ Thanks to @thomashvmw @rhertzog (Closes: #924518)
+
+ -- Bernd Zeimetz <bzed@debian.org> Wed, 13 Mar 2019 22:15:22 +0100
+
open-vm-tools (2:10.3.5-7) unstable; urgency=medium
[ Christian Ehrhardt ]
--
2.20.1
--- End Message ---