From 44752ab128baade57d851e2d64c82942b857b0f4 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Aug 21 2015 17:56:40 +0000
Subject: - Resolves: 1255578 - conntrackd could neither be started nor be stopped


---

diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index f92b90b..9537d8e 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,6 +1,6 @@
 Name:           conntrack-tools
 Version:        1.4.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Manipulate netfilter connection tracking table and run High Availability
 Group:          System Environment/Base
 License:        GPLv2
@@ -81,6 +81,9 @@ install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
 %systemd_postun conntrackd.service 
 
 %changelog
+* Fri Aug 21 2015 Paul Wouters <pwouters@redhat.com> - 1.4.2-10
+- Resolves: 1255578 - conntrackd could neither be started nor be stopped
+
 * Tue Aug 18 2015 Paul Wouters <pwouters@redhat.com> - 1.4.2-9
 - Resolves: rhbz#CVE-2015-6496, rhbz#1253757
 - Fold in upstream patches since 1.4.2 release up to git 900d7e8
diff --git a/conntrackd.service b/conntrackd.service
index bfc5b72..9c108d7 100644
--- a/conntrackd.service
+++ b/conntrackd.service
@@ -5,6 +5,8 @@ Wants=network-online.target
 
 [Service]
 Type=simple
+# rhbz#1255578 daemon will not start if lock file is left dangling
+ExecStartPre=/bin/rm -f /var/lock/conntrack.lock
 ExecStart=/usr/sbin/conntrackd -C /etc/conntrackd/conntrackd.conf
 
 [Install]