UBUNTU: [Packaging] bind hv_kvp_daemon startup to hv_kvp device

BugLink: https://bugs.launchpad.net/bugs/1820063 The hv_kvp_daemon service requires the hv_kvp device and should be started when the device appears and stopped in it disappears. Solution is based off the one provided at https://bugzilla.redhat.com/show_bug.cgi?id=1195029#c22. Acked-by: Thadeu Lima de Souza Cascardo <[email protected]> Acked-by: Colin Ian King <[email protected]> Signed-off-by: Seth Forshee <[email protected]>
AnetaCadova · Apr 10, 2019 · 8e2ea6b · 8e2ea6b
1 parent c73d7d9
commit 8e2ea6b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/debian/linux-cloud-tools-common.hv-kvp-daemon.service b/debian/linux-cloud-tools-common.hv-kvp-daemon.service
@@ -5,7 +5,8 @@
 Description=Hyper-V KVP Protocol Daemon
 ConditionVirtualization=microsoft
 DefaultDependencies=no
-After=systemd-remount-fs.service
+BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
+After=sys-devices-virtual-misc-vmbus\x21hv_kvp.device systemd-remount-fs.service
 Before=shutdown.target cloud-init-local.service walinuxagent.service
 Conflicts=shutdown.target
 RequiresMountsFor=/var/lib/hyperv

diff --git a/debian/linux-cloud-tools-common.hv-kvp-daemon.udev b/debian/linux-cloud-tools-common.hv-kvp-daemon.udev
@@ -0,0 +1 @@
+SUBSYSTEM=="misc", KERNEL=="vmbus/hv_kvp", TAG+="systemd", ENV{SYSTEMD_WANTS}+="hv-kvp-daemon.service"
diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
@@ -190,6 +190,7 @@ ifeq ($(do_tools_hyperv),true)
 	dh_installinit -p$(cloudpkg) -n --name hv-kvp-daemon
 	dh_installinit -p$(cloudpkg) -n --name hv-vss-daemon
 	dh_installinit -p$(cloudpkg) -n --name hv-fcopy-daemon
+	dh_installudev -p$(cloudpkg) -n --name hv-kvp-daemon
 	dh_systemd_enable -p$(cloudpkg)
 	dh_installinit -p$(cloudpkg) -o --name hv-kvp-daemon
 	dh_installinit -p$(cloudpkg) -o --name hv-vss-daemon
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		SUBSYSTEM=="misc", KERNEL=="vmbus/hv_kvp", TAG+="systemd", ENV{SYSTEMD_WANTS}+="hv-kvp-daemon.service"