aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/hyperv-daemons.hv-fcopy-daemon.service2
-rw-r--r--debian/hyperv-daemons.hv-kvp-daemon.service2
-rw-r--r--debian/hyperv-daemons.hv-vss-daemon.service2
4 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 62b5fc218a81..7f64d6e7df1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ linux (5.8-1~exp1) UNRELEASED; urgency=medium
[ Ben Hutchings ]
* [x86] hyperv-daemons: Complete renaming of init scripts
+ * [x86] hyperv-daemons: Correct old names in Conflicts field of unit files
-- Yves-Alexis Perez <corsac@debian.org> Wed, 24 Jun 2020 21:58:24 +0200
diff --git a/debian/hyperv-daemons.hv-fcopy-daemon.service b/debian/hyperv-daemons.hv-fcopy-daemon.service
index 8a2a02c5f9bb..d8e4d3b8a3e2 100644
--- a/debian/hyperv-daemons.hv-fcopy-daemon.service
+++ b/debian/hyperv-daemons.hv-fcopy-daemon.service
@@ -1,6 +1,6 @@
[Unit]
Description=Hyper-V file copy service (FCOPY) daemon
-Conflicts=hyperv-daemon.hv-fcopy-daemon.service
+Conflicts=hyperv-daemons.hv-fcopy-daemon.service
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_fcopy.device
[Service]
diff --git a/debian/hyperv-daemons.hv-kvp-daemon.service b/debian/hyperv-daemons.hv-kvp-daemon.service
index d4a274b116d2..67496e353729 100644
--- a/debian/hyperv-daemons.hv-kvp-daemon.service
+++ b/debian/hyperv-daemons.hv-kvp-daemon.service
@@ -2,7 +2,7 @@
Description=Hyper-V key-value pair (KVP) daemon
DefaultDependencies=no
Before=sysinit.target shutdown.target
-Conflicts=hyperv-daemon.hv-kvp-daemon.service shutdown.target
+Conflicts=hyperv-daemons.hv-kvp-daemon.service shutdown.target
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
IgnoreOnIsolate=1
diff --git a/debian/hyperv-daemons.hv-vss-daemon.service b/debian/hyperv-daemons.hv-vss-daemon.service
index 933857e4a718..fd3fd6dcd77d 100644
--- a/debian/hyperv-daemons.hv-vss-daemon.service
+++ b/debian/hyperv-daemons.hv-vss-daemon.service
@@ -1,6 +1,6 @@
[Unit]
Description=Hyper-V volume shadow copy service (VSS) daemon
-Conflicts=hyperv-daemon.hv-vss-daemon.service
+Conflicts=hyperv-daemons.hv-vss-daemon.service
BindsTo=sys-devices-virtual-misc-vmbus\x21hv_vss.device
[Service]