cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [2/2] git commit: updated refs/heads/4.4 to b431cd5
Date Tue, 11 Nov 2014 14:57:12 GMT
Logrotate is called from crontab.

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

 conflict leftovers from 380ecf2253dd03905df25f30422b67ec1b17ff19

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b431cd5e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b431cd5e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b431cd5e

Branch: refs/heads/4.4
Commit: b431cd5e09ad9841568f21dd41267ea5fa1b5195
Parents: 8de7f84
Author: Daan Hoogland <daan@onecht.net>
Authored: Tue Nov 11 15:56:09 2014 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Tue Nov 11 15:56:09 2014 +0100

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b431cd5e/systemvm/patches/debian/config/etc/logrotate.d/cloud
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/config/etc/logrotate.d/cloud
index 37440ac..617b09b 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
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b431cd5e/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
index d09d752..8139191 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
 }


Mime
View raw message