[Pkg-samba-maint] r3837 - in branches/ctdb/squeeze/debian: . patches

[sathieu at alioth.debian.org]

tags 635135 pending
thanks

Author: sathieu
Date: 2011-07-22 22:10:32 +0000 (Fri, 22 Jul 2011)
New Revision: 3837

Added:
   branches/ctdb/squeeze/debian/patches/91-ethtool-path.diff
Modified:
   branches/ctdb/squeeze/debian/changelog
   branches/ctdb/squeeze/debian/patches/series
Log:
Fix ethtool path in /etc/ctdb/events.d/10.interface (Closes: #635135)



Modified: branches/ctdb/squeeze/debian/changelog
===================================================================
--- branches/ctdb/squeeze/debian/changelog	2011-07-22 21:52:34 UTC (rev 3836)
+++ branches/ctdb/squeeze/debian/changelog	2011-07-22 22:10:32 UTC (rev 3837)
@@ -1,3 +1,9 @@
+ctdb (1.0.112-12-2) UNRELEASED; urgency=low
+
+  * Fix ethtool path in /etc/ctdb/events.d/10.interface (Closes: #635135)
+
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 23 Jul 2011 00:08:07 +0200
+
 ctdb (1.0.112-12-1) unstable; urgency=low
 
   * New upstream release

Added: branches/ctdb/squeeze/debian/patches/91-ethtool-path.diff
===================================================================
--- branches/ctdb/squeeze/debian/patches/91-ethtool-path.diff	                        (rev 0)
+++ branches/ctdb/squeeze/debian/patches/91-ethtool-path.diff	2011-07-22 22:10:32 UTC (rev 3837)
@@ -0,0 +1,20 @@
+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
+ 			}

Modified: branches/ctdb/squeeze/debian/patches/series
===================================================================
--- branches/ctdb/squeeze/debian/patches/series	2011-07-22 21:52:34 UTC (rev 3836)
+++ branches/ctdb/squeeze/debian/patches/series	2011-07-22 22:10:32 UTC (rev 3837)
@@ -6,3 +6,4 @@
 61-spelling-errors-manpages.diff
 70-nfstickle-sysconfig.diff
 71-correct-nice_service.diff
+91-ethtool-path.diff