From b431cd5e09ad9841568f21dd41267ea5fa1b5195 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Tue, 11 Nov 2014 15:56:09 +0100
Subject: [PATCH] Logrotate is called from crontab.

 Debian crontab does not include everything in it's path.
 Therefore reference to these bins

 conflict leftovers from 380ecf2253dd03905df25f30422b67ec1b17ff19
---
 systemvm/patches/debian/config/etc/logrotate.d/cloud      | 2 +-
 systemvm/patches/debian/config/etc/logrotate.d/conntrackd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/config/etc/logrotate.d/cloud
index 37440ace69f..617b09b2adc 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/cloud
+++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud
@@ -22,6 +22,6 @@
         compress
         delaycompress
         postrotate
-                pkill socat > /dev/null
+                /usr/bin/pkill socat > /dev/null
         endscript
 }
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
index d09d752e11e..8139191e27f 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
+++ b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
@@ -7,7 +7,7 @@
 
     postrotate
         if [ -e /var/run/conntrackd.sock ]; then
-            invoke-rc.d conntrackd restart > /dev/null
+            /usr/sbin/invoke-rc.d conntrackd restart > /dev/null
         fi
     endscript
 }