[Pkg-samba-maint] r3374 - in trunk/ctdb/debian: . patches
sathieu at alioth.debian.org
sathieu at alioth.debian.org
Thu Mar 4 15:42:35 UTC 2010
Author: sathieu
Date: 2010-03-04 15:42:34 +0000 (Thu, 04 Mar 2010)
New Revision: 3374
Added:
trunk/ctdb/debian/patches/70-nfstickle-sysconfig.diff
Modified:
trunk/ctdb/debian/changelog
trunk/ctdb/debian/patches/05-hurd.diff
trunk/ctdb/debian/patches/10_no-lib64.diff
trunk/ctdb/debian/patches/50-fix-bashism.diff
trunk/ctdb/debian/patches/series
Log:
New 70-nfstickle-sysconfig.diff: Don't call /etc/sysconfig/nfs
Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog 2010-03-04 15:18:49 UTC (rev 3373)
+++ trunk/ctdb/debian/changelog 2010-03-04 15:42:34 UTC (rev 3374)
@@ -10,6 +10,7 @@
* Move logfile to /var/log/ctdb. Fix "Log file should be renamed"
(Closes: #569205)
* 50-fix-bashism.diff is back (Fix some more bashisms)
+ * New 70-nfstickle-sysconfig.diff: Don't call /etc/sysconfig/nfs
-- Mathieu Parent <sathieu at debian.org> Wed, 03 Mar 2010 12:32:39 +0100
Modified: trunk/ctdb/debian/patches/05-hurd.diff
===================================================================
--- trunk/ctdb/debian/patches/05-hurd.diff 2010-03-04 15:18:49 UTC (rev 3373)
+++ trunk/ctdb/debian/patches/05-hurd.diff 2010-03-04 15:42:34 UTC (rev 3374)
@@ -10,7 +10,7 @@
===================================================================
--- a/configure
+++ b/configure
-@@ -2469,6 +2469,11 @@
+@@ -1759,6 +1759,11 @@
CTDB_SCSI_IO=
CTDB_PCAP_LDFLAGS=-lpcap
;;
@@ -42,7 +42,7 @@
===================================================================
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
-@@ -566,6 +566,7 @@
+@@ -571,6 +571,7 @@
struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context);
struct ctdb_client *client;
struct ctdb_client_pid_list *client_pid;
@@ -50,7 +50,7 @@
#ifdef _AIX
struct peercred_struct cr;
socklen_t crl = sizeof(struct peercred_struct);
-@@ -573,6 +574,7 @@
+@@ -578,6 +579,7 @@
struct ucred cr;
socklen_t crl = sizeof(struct ucred);
#endif
@@ -58,7 +58,7 @@
memset(&addr, 0, sizeof(addr));
len = sizeof(addr);
-@@ -587,6 +589,7 @@
+@@ -592,6 +594,7 @@
DEBUG(DEBUG_DEBUG,(__location__ " Created SOCKET FD:%d to connected child\n", fd));
client = talloc_zero(ctdb, struct ctdb_client);
@@ -66,7 +66,7 @@
#ifdef _AIX
if (getsockopt(fd, SOL_SOCKET, SO_PEERID, &cr, &crl) == 0) {
#else
-@@ -594,11 +597,14 @@
+@@ -599,11 +602,14 @@
#endif
DEBUG(DEBUG_INFO,("Connected client with pid:%u\n", (unsigned)cr.pid));
}
@@ -81,7 +81,7 @@
client_pid = talloc(client, struct ctdb_client_pid_list);
if (client_pid == NULL) {
-@@ -608,7 +614,9 @@
+@@ -613,7 +619,9 @@
return;
}
client_pid->ctdb = ctdb;
Modified: trunk/ctdb/debian/patches/10_no-lib64.diff
===================================================================
--- trunk/ctdb/debian/patches/10_no-lib64.diff 2010-03-04 15:18:49 UTC (rev 3373)
+++ trunk/ctdb/debian/patches/10_no-lib64.diff 2010-03-04 15:42:34 UTC (rev 3374)
@@ -10,7 +10,7 @@
===================================================================
--- a/configure
+++ b/configure
-@@ -2449,7 +2449,7 @@
+@@ -1739,7 +1739,7 @@
if test "${libdir}" = '${exec_prefix}/lib'; then
case `uname -m` in
Modified: trunk/ctdb/debian/patches/50-fix-bashism.diff
===================================================================
--- trunk/ctdb/debian/patches/50-fix-bashism.diff 2010-03-04 15:18:49 UTC (rev 3373)
+++ trunk/ctdb/debian/patches/50-fix-bashism.diff 2010-03-04 15:42:34 UTC (rev 3374)
@@ -4,10 +4,11 @@
Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6407
-diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
+Index: b/config/events.d/11.natgw
+===================================================================
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
-@@ -41,7 +41,7 @@ case "$1" in
+@@ -38,7 +38,7 @@
NATGWIP=`ctdb natgwlist | head -1 | sed -e "s/^[^ ]* *//"`
CTDB_NATGW_PUBLIC_IP_HOST=`echo $CTDB_NATGW_PUBLIC_IP | sed -e "s/\/.*/\/32/"`
@@ -16,5 +17,3 @@
echo "There is not NATGW master node"
exit 1
fi
-
-
Added: trunk/ctdb/debian/patches/70-nfstickle-sysconfig.diff
===================================================================
--- trunk/ctdb/debian/patches/70-nfstickle-sysconfig.diff (rev 0)
+++ trunk/ctdb/debian/patches/70-nfstickle-sysconfig.diff 2010-03-04 15:42:34 UTC (rev 3374)
@@ -0,0 +1,30 @@
+Goal: Don't call /etc/sysconfig/nfs
+
+Author: Martin Schwenke <martin at meltin.net>
+
+Note: the upstream fix is for another goal.
+
+Upstream status: http://git.samba.org/?p=sahlberg/ctdb.git;a=commitdiff;h=ee8b2e298351d05197a2e1494f3331433644c1e6
+
+Index: b/config/events.d/61.nfstickle
+===================================================================
+--- a/config/events.d/61.nfstickle
++++ b/config/events.d/61.nfstickle
+@@ -3,14 +3,13 @@
+
+ . $CTDB_BASE/functions
+
+-. /etc/sysconfig/nfs
+-
+ service_name="nfs"
+-service_start="mkdir -p $CTDB_BASE/state/nfstickle;mkdir -p $NFS_TICKLE_SHARED_DIRECTORY/`hostname`;echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle"
+-service_reconfigure=$service_start
+
+ loadconfig
+
++service_start="mkdir -p $CTDB_BASE/state/nfstickle;mkdir -p $NFS_TICKLE_SHARED_DIRECTORY/`hostname`;echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle"
++service_reconfigure=$service_start
++
+ ctdb_start_stop_service
+
+ [ -z "$NFS_TICKLE_SHARED_DIRECTORY" ] && exit 0
Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series 2010-03-04 15:18:49 UTC (rev 3373)
+++ trunk/ctdb/debian/patches/series 2010-03-04 15:42:34 UTC (rev 3374)
@@ -4,3 +4,4 @@
50-fix-bashism.diff
60-spelling-errors.diff
61-spelling-errors-manpages.diff
+70-nfstickle-sysconfig.diff
More information about the Pkg-samba-maint
mailing list