Bug#730764: pu: package ctdb/1.12+git20120201-4

[Mathieu Parent <math.parent@gmail.com>]

Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: pu
Severity: normal

ctdb in wheezy cannot be stopped properly and cannot be restarted.

This is due to "set -e" in the init script and "ip addr del" returning 2 when
the ip is not assigned.


The complete git diff is attached.

Regards

Mathieu Parent

From cb465402f32abd6e03a5949155ba9af0fd0cdadd Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Fri, 29 Nov 2013 12:03:38 +0100
Subject: [PATCH] Fix service stop and restart failing

when trying to remove a public ip not assigned locally
(Closes: #730763)
---
 debian/changelog | 7 +++++++
 debian/ctdb.init | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d2a3b43..f629ad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ctdb (1.12+git20120201-4) stable; urgency=low
+
+  * Fix service stop and restart failing when trying to remove a public ip not
+    assigned locally (Closes: #730763)
+
+ -- Mathieu Parent <sathieu@debian.org>  Fri, 29 Nov 2013 11:48:10 +0100
+
 ctdb (1.12+git20120201-3) unstable; urgency=high
 
   * Team upload.
diff --git a/debian/ctdb.init b/debian/ctdb.init
index 6bd73e6..e3f2eb9 100644
--- a/debian/ctdb.init
+++ b/debian/ctdb.init
@@ -279,7 +279,7 @@ drop_all_public_ips() {
     }
 
     cat $CTDB_PUBLIC_ADDRESSES | while read IP IFACE REST; do
-	ip addr del $IP dev $IFACE >/dev/null 2>/dev/null
+	ip addr del $IP dev $IFACE >/dev/null 2>/dev/null ||:
     done
 }
 
-- 
1.8.4.3