[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.7.0-1-42-g8ec84dc

[Apollon Oikonomopoulos]

The following commit has been merged in the master branch:
commit 8ec84dc5a8723f3e5bdcc0247d4f5092e62706b5
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Tue Jul 23 16:56:25 2013 +0300

    Fix wrong check against ganeti-master-cleaner in crontab
    
    Backport upstream commit 927840bc.

diff --git a/debian/patches/fix-ganeti-cleaner-in-crontab.patch b/debian/patches/fix-ganeti-cleaner-in-crontab.patch
new file mode 100644
index 0000000..0e8471e
--- /dev/null
+++ b/debian/patches/fix-ganeti-cleaner-in-crontab.patch
@@ -0,0 +1,25 @@
+commit 927840bc3f7010944d167f85c5d899c9f1efd34c
+Author: Klaus Aehlig <aehlig at google.com>
+Date:   Tue Jul 9 10:40:52 2013 +0200
+
+    In the crontab example, look for the correct binary
+    
+    When ganeti-master-cleaner was merged back into ganeti-cleaner in 46118ed2,
+    the binary to test for should have also been updated. Do this now.
+    
+    Signed-off-by: Klaus Aehlig <aehlig at google.com>
+    Reviewed-by: Helga Velroyen <helgav at google.com>
+
+diff --git a/doc/examples/ganeti.cron.in b/doc/examples/ganeti.cron.in
+index 964af57..1112b21 100644
+--- a/doc/examples/ganeti.cron.in
++++ b/doc/examples/ganeti.cron.in
+@@ -4,7 +4,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+ */5 * * * * root [ -x @SBINDIR@/ganeti-watcher ] && @SBINDIR@/ganeti-watcher
+ 
+ # Clean job archive (at 01:45 AM)
+-45 1 * * * @GNTMASTERUSER@ [ -x @SBINDIR@/ganeti-master-cleaner ] && @SBINDIR@/ganeti-cleaner master
++45 1 * * * @GNTMASTERUSER@ [ -x @SBINDIR@/ganeti-cleaner ] && @SBINDIR@/ganeti-cleaner master
+ 
+ # Clean job archive (at 02:45 AM)
+ 45 2 * * * @GNTNODEDUSER@ [ -x @SBINDIR@/ganeti-cleaner ] && @SBINDIR@/ganeti-cleaner node
diff --git a/debian/patches/series b/debian/patches/series
index bbec817..4a9a920 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
 0001-daemon-util-provide-rotate-and-rotate_all-actions.patch
+fix-ganeti-cleaner-in-crontab.patch

-- 
Ganeti packaging