[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.7.0-1-54-g1fd06ae
Apollon Oikonomopoulos
apoikos at gmail.com
Sun Jul 28 13:34:49 UTC 2013
The following commit has been merged in the master branch:
commit 5887c4aa7d2cd79e2b6e2267db855cd442d96fec
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date: Sun Jul 28 05:02:25 2013 +0300
Drop patches already merged upstream
diff --git a/debian/changelog b/debian/changelog
index 1830592..f84957f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
ganeti (2.7.1-1) unstable; urgency=low
* New upstream version
+ * Drop the following patches already merged upstream:
+ - 0001-daemon-util-pass-oknodo-at-rotate_logs.patch
+ - 0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
+ - fix-ganeti-cleaner-in-crontab.patch
-- Apollon Oikonomopoulos <apoikos at gmail.com> Sun, 28 Jul 2013 04:59:44 +0300
diff --git a/debian/patches/0001-daemon-util-pass-oknodo-at-rotate_logs.patch b/debian/patches/0001-daemon-util-pass-oknodo-at-rotate_logs.patch
deleted file mode 100644
index 8a79c45..0000000
--- a/debian/patches/0001-daemon-util-pass-oknodo-at-rotate_logs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9a8e4b73779add04a9852759c857ef082b19cf44 Mon Sep 17 00:00:00 2001
-From: Apollon Oikonomopoulos <apoikos at gmail.com>
-Date: Wed, 24 Jul 2013 09:22:00 +0300
-Subject: [PATCH] daemon-util: pass --oknodo at rotate_logs
-
-daemon-util's rotate_logs() did not pass --oknodo to start-stop-daemon while
-HUPing the daemon processes. As a result, rotate_logs would fail for a
-non-running daemon causing rotate_all_logs to exit prematurely.
-
-We can fix this by either passing --oknodo to start-stop-daemon, or have
-rotate_all_logs ignore any errors. The former is probably a safer approach - as
-it doesn't mask any potential coding errors in rotate_logs - and is also
-semantically correct (we only care about log rotation if a daemon is actually
-running).
-
-Signed-off-by: Apollon Oikonomopoulos <apoikos at gmail.com>
-Reviewed-by: Guido Trotter <ultrotter at google.com>
----
- daemons/daemon-util.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 2be14e9..848a122 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -324,7 +324,7 @@ rotate_logs() {
-
- if type -p start-stop-daemon >/dev/null; then
- start-stop-daemon --stop --signal HUP --quiet \
-- --pidfile $pidfile
-+ --oknodo --pidfile $pidfile
- else
- _ignore_error killproc \
- -p $pidfile \
---
-1.7.10.4
-
diff --git a/debian/patches/0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch b/debian/patches/0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
deleted file mode 100644
index 408dc61..0000000
--- a/debian/patches/0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f99cbfbdfa1ead0f36930ebcd3891c8ae3597fe1 Mon Sep 17 00:00:00 2001
-From: Apollon Oikonomopoulos <apoikos at gmail.com>
-Date: Tue, 23 Jul 2013 17:21:31 +0300
-Subject: [PATCH 1/2] daemon-util: provide rotate_logs and rotate_all_logs
- actions
-
-Modify daemon-util to allow sending SIGHUP to one or all daemons. This is meant
-as a utility function to be used in logrotate definitions.
-
-Signed-off-by: Apollon Oikonomopoulos <apoikos at gmail.com>
-Reviewed-by: Guido Trotter <ultrotter at google.com>
----
- daemons/daemon-util.in | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 9481dc0..2be14e9 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -311,6 +311,34 @@ stop_all() {
- done
- }
-
-+# SIGHUP a process to force re-opening its logfiles
-+rotate_logs() {
-+ if [[ "$#" -lt 1 ]]; then
-+ echo 'Missing daemon name.' >&2
-+ return 1
-+ fi
-+
-+ local name="$1"; shift
-+ local pidfile=$(_daemon_pidfile $name)
-+ local daemonexec=$(_daemon_executable $name)
-+
-+ if type -p start-stop-daemon >/dev/null; then
-+ start-stop-daemon --stop --signal HUP --quiet \
-+ --pidfile $pidfile
-+ else
-+ _ignore_error killproc \
-+ -p $pidfile \
-+ $daemonexec -HUP
-+ fi
-+}
-+
-+# SIGHUP all processes
-+rotate_all_logs() {
-+ for i in $(list_stop_daemons); do
-+ rotate_logs $i
-+ done
-+}
-+
- # Reloads the SSH keys
- reload_ssh_keys() {
- @RPL_SSH_INITD_SCRIPT@ restart
---
-1.7.10.4
-
diff --git a/debian/patches/fix-ganeti-cleaner-in-crontab.patch b/debian/patches/fix-ganeti-cleaner-in-crontab.patch
deleted file mode 100644
index 0e8471e..0000000
--- a/debian/patches/fix-ganeti-cleaner-in-crontab.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 1ef225c..7011cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
fix-startup-with-old-config.patch
cfgupgrade12-remove-old-ssconf.patch
0003-Disable-local-checks-during-build.patch
-fix-ganeti-cleaner-in-crontab.patch
-0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
-0001-daemon-util-pass-oknodo-at-rotate_logs.patch
--
Ganeti packaging
More information about the Pkg-ganeti-devel
mailing list