| 1 |
dev-zero 10/04/05 06:14:53 |
| 2 |
|
| 3 |
Added: ctdb-1.0.114_p1-functions.patch |
| 4 |
Log: |
| 5 |
Version bump (needed for samba-3.5.x, one patch not needed anymore, other patch ported), fixed tests (bug #278141). |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: ctdb-1.0.114_p1-functions.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur ctdb-1.0.114.orig/config/functions ctdb-1.0.114/config/functions |
| 17 |
--- ctdb-1.0.114.orig/config/functions 2010-04-04 18:01:18.278707515 +0200 |
| 18 |
+++ ctdb-1.0.114/config/functions 2010-04-04 18:08:05.792447032 +0200 |
| 19 |
@@ -22,6 +22,8 @@ |
| 20 |
. /etc/default/$1 |
| 21 |
elif [ -f $CTDB_BASE/sysconfig/$1 ]; then |
| 22 |
. $CTDB_BASE/sysconfig/$1 |
| 23 |
+ elif [ -f /etc/config.d/$1 ]; then |
| 24 |
+ . /etc/config.d/$name |
| 25 |
fi |
| 26 |
} |
| 27 |
|
| 28 |
@@ -33,6 +35,8 @@ |
| 29 |
|
| 30 |
if [ -x /sbin/startproc ]; then |
| 31 |
CTDB_INIT_STYLE="suse" |
| 32 |
+ elif [ -x /bin/rc-status ] ; then |
| 33 |
+ CTDB_INIT_STYLE="gentoo" |
| 34 |
elif [ -x /sbin/start-stop-daemon ]; then |
| 35 |
CTDB_INIT_STYLE="debian" |
| 36 |
else |
| 37 |
@@ -356,6 +360,9 @@ |
| 38 |
[ -x /etc/init.d/nfslock ] && { |
| 39 |
PLATFORM="rhel" |
| 40 |
} |
| 41 |
+ [ -x etc/init.d/nfs ] && { |
| 42 |
+ PLATFORM="gentoo" |
| 43 |
+ } |
| 44 |
|
| 45 |
case $PLATFORM in |
| 46 |
sles) |
| 47 |
@@ -380,6 +387,16 @@ |
| 48 |
;; |
| 49 |
esac |
| 50 |
;; |
| 51 |
+ gentoo) |
| 52 |
+ case $1 in |
| 53 |
+ start) |
| 54 |
+ service nfs start |
| 55 |
+ ;; |
| 56 |
+ stop) |
| 57 |
+ service nfs stop > /dev/null 2>&1 |
| 58 |
+ ;; |
| 59 |
+ esac |
| 60 |
+ ;; |
| 61 |
*) |
| 62 |
echo "Unknown platform. NFS is not supported with ctdb" |
| 63 |
exit 1 |
| 64 |
@@ -398,6 +415,9 @@ |
| 65 |
[ -x /etc/init.d/nfslock ] && { |
| 66 |
PLATFORM="rhel" |
| 67 |
} |
| 68 |
+ [ -x etc/init.d/nfs ] && { |
| 69 |
+ PLATFORM="gentoo" |
| 70 |
+ } |
| 71 |
|
| 72 |
case $PLATFORM in |
| 73 |
sles) |
| 74 |
@@ -422,6 +442,18 @@ |
| 75 |
;; |
| 76 |
esac |
| 77 |
;; |
| 78 |
+ gentoo) |
| 79 |
+ # for gentoo there is no service for lockmanager |
| 80 |
+ # so we instead just shutdown/restart nfs |
| 81 |
+ case $1 in |
| 82 |
+ start) |
| 83 |
+ service nfs start |
| 84 |
+ ;; |
| 85 |
+ stop) |
| 86 |
+ service nfs stop > /dev/null 2>&1 |
| 87 |
+ ;; |
| 88 |
+ esac |
| 89 |
+ ;; |
| 90 |
*) |
| 91 |
echo "Unknown platform. NFS locking is not supported with ctdb" |
| 92 |
exit 1 |
Archives