ctdb for stable-proposed-updates
(please cc me)
Hello,
I have prepared an upload of ctdb to stable (-proposed-updates).
The upload fix two small but annoying bugs:
* Fix ethtool path in /etc/ctdb/events.d/10.interface (Closes: #635135)
* Fix httpd (i.e. apache2 service) activation (Closes: #635136)
See attached complete diff.
Can I upload?
Regards
--
Mathieu Parent
Index: debian/changelog
===================================================================
--- debian/changelog (révision 3836)
+++ debian/changelog (révision 3841)
@@ -1,3 +1,10 @@
+ctdb (1.0.112-12-1+squeeze1) stable; urgency=low
+
+ * Fix ethtool path in /etc/ctdb/events.d/10.interface (Closes: #635135)
+ * Fix httpd (i.e. apache2 service) activation (Closes: #635136)
+
+ -- Mathieu Parent <sathieu@debian.org> Sat, 23 Jul 2011 00:37:26 +0200
+
ctdb (1.0.112-12-1) unstable; urgency=low
* New upstream release
Index: debian/patches/92-apache-service-enable.diff
===================================================================
--- debian/patches/92-apache-service-enable.diff (révision 0)
+++ debian/patches/92-apache-service-enable.diff (révision 3841)
@@ -0,0 +1,21 @@
+Goal: Fix httpd (i.e. apache2 service) activation
+
+(Closes: #635136)
+
+Author: Mathieu Parent <math.parent@gmail.com>
+
+Upstream status: to be sent
+
+Index: ctdb-1.0.112-12/config/events.d/41.httpd
+===================================================================
+--- ctdb-1.0.112-12.orig/config/events.d/41.httpd 2011-07-22 23:59:47.000000000 +0200
++++ ctdb-1.0.112-12/config/events.d/41.httpd 2011-07-23 00:00:09.000000000 +0200
+@@ -35,7 +35,7 @@
+
+ ctdb_start_stop_service
+
+-is_ctdb_managed_service || exit 0
++is_ctdb_managed_service httpd || exit 0
+
+ case "$1" in
+ startup)
Index: debian/patches/91-ethtool-path.diff
===================================================================
--- debian/patches/91-ethtool-path.diff (révision 0)
+++ debian/patches/91-ethtool-path.diff (révision 3841)
@@ -0,0 +1,29 @@
+Goal: Fix ethtool path in /etc/ctdb/events.d/10.interface
+
+(Closes: #635135)
+http://git.samba.org/?p=ctdb.git;a=commitdiff;h=3bab985cf615720eded4d47b4f9f37a9c28840aa
+
+Author: Stefan Metzmacher <metze@samba.org>
+
+Upstream status: Already in (for other reasons, see commit)
+
+Index: ctdb-1.0.112-12/config/events.d/10.interface
+===================================================================
+--- ctdb-1.0.112-12.orig/config/events.d/10.interface 2011-07-22 23:58:09.000000000 +0200
++++ ctdb-1.0.112-12/config/events.d/10.interface 2011-07-22 23:58:34.000000000 +0200
+@@ -164,13 +164,13 @@
+ ;;
+ *)
+ [ -z "$IFACE" ] || {
+- /usr/sbin/ethtool $IFACE | grep -q 'Link detected: yes' || {
++ ethtool $IFACE | grep -q 'Link detected: yes' || {
+ # On some systems, this is not successful when a
+ # cable is plugged but the interface has not been
+ # brought up previously. Bring the interface up and
+ # try again...
+ /sbin/ip link set $IFACE up
+- /usr/sbin/ethtool $IFACE | grep -q 'Link detected: yes' || {
++ ethtool $IFACE | grep -q 'Link detected: yes' || {
+ echo "ERROR: No link on the public network interface $IFACE"
+ exit 1
+ }
Index: debian/patches/series
===================================================================
--- debian/patches/series (révision 3836)
+++ debian/patches/series (révision 3841)
@@ -6,3 +6,5 @@
61-spelling-errors-manpages.diff
70-nfstickle-sysconfig.diff
71-correct-nice_service.diff
+91-ethtool-path.diff
+92-apache-service-enable.diff
Reply to: