[Pkg-samba-maint] r1728 - in trunk/ctdb/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Tue Feb 12 18:52:20 UTC 2008
Author: mparent-guest
Date: 2008-02-12 18:52:20 +0000 (Tue, 12 Feb 2008)
New Revision: 1728
Added:
trunk/ctdb/debian/patches/05_nice_service.diff
trunk/ctdb/debian/patches/06_services_names.diff
Removed:
trunk/ctdb/debian/patches/05_init_names.diff
Modified:
trunk/ctdb/debian/changelog
trunk/ctdb/debian/ctdb.TODO
trunk/ctdb/debian/patches/series
Log:
* Splitted init_names patch in two (05_nice_service submitted upstream)
* bump to 1.0.28+git200802081512
* Updated changelog accordingly
Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog 2008-02-12 11:38:30 UTC (rev 1727)
+++ trunk/ctdb/debian/changelog 2008-02-12 18:52:20 UTC (rev 1728)
@@ -1,10 +1,12 @@
-ctdb (1.0.27+git200802072301-1) unstable; urgency=low
+ctdb (1.0.28+git200802081512-1) unstable; urgency=low
* Initial release (Closes: #460114)
* 02_ctdb_diagnostics.diff: adapt ctdb_diagnostics to debian
* 03_web.diff: correct various paths in documentation
* 04_install_chmod.patch: correct Makefile to install proper execution
permissions
+ * 05_nice_service.diff: create a nice_service function
+ * 06_services_names.diff: correct services names
* init script with start/stop/status
* logrotate for /var/log/log.ctdb
Modified: trunk/ctdb/debian/ctdb.TODO
===================================================================
--- trunk/ctdb/debian/ctdb.TODO 2008-02-12 11:38:30 UTC (rev 1727)
+++ trunk/ctdb/debian/ctdb.TODO 2008-02-12 18:52:20 UTC (rev 1728)
@@ -4,5 +4,3 @@
W: ctdb: binary-without-manpage usr/bin/onnode.rsh
W: ctdb: binary-without-manpage usr/bin/onnode.ssh
W: ctdb: binary-without-manpage usr/bin/smnotify
-* nice service smb start should not be replaced by service samba start (see
- patch 05_init_names.diff).
\ No newline at end of file
Deleted: trunk/ctdb/debian/patches/05_init_names.diff
===================================================================
--- trunk/ctdb/debian/patches/05_init_names.diff 2008-02-12 11:38:30 UTC (rev 1727)
+++ trunk/ctdb/debian/patches/05_init_names.diff 2008-02-12 18:52:20 UTC (rev 1728)
@@ -1,118 +0,0 @@
-Index: ctdb-1.0.25+git200801291431/config/events.d/41.httpd
-===================================================================
---- ctdb-1.0.25+git200801291431.orig/config/events.d/41.httpd 2008-02-03 20:44:30.000000000 +0100
-+++ ctdb-1.0.25+git200801291431/config/events.d/41.httpd 2008-02-03 21:28:28.000000000 +0100
-@@ -1,9 +1,9 @@
- #!/bin/sh
--# event strict to manage httpd in a cluster environment
-+# event strict to manage apache2 in a cluster environment
-
- . $CTDB_BASE/functions
- loadconfig ctdb
--loadconfig http
-+loadconfig apache2
-
- [ "$CTDB_MANAGES_HTTPD" = "yes" ] || exit 0
-
-@@ -12,12 +12,12 @@
-
- case $cmd in
- startup)
-- service httpd stop > /dev/null 2>&1
-- service httpd start
-+ service apache2 stop > /dev/null 2>&1
-+ service apache2 start
- ;;
-
- shutdown)
-- service httpd stop
-+ service apache2 stop
- ;;
-
- monitor)
-Index: ctdb-1.0.25+git200801291431/config/events.d/60.nfs
-===================================================================
---- ctdb-1.0.25+git200801291431.orig/config/events.d/60.nfs 2008-02-03 20:44:30.000000000 +0100
-+++ ctdb-1.0.25+git200801291431/config/events.d/60.nfs 2008-02-03 21:28:28.000000000 +0100
-@@ -2,7 +2,7 @@
- # script to manage nfs in a clustered environment
-
- . $CTDB_BASE/functions
--loadconfig nfs
-+loadconfig nfs-kernel-server
-
- [ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
- [ -z "$STATD_SHARED_DIRECTORY" ] && exit 0
-@@ -14,24 +14,21 @@
-
- case $cmd in
- startup)
-- /bin/mkdir -p $CTDB_BASE/state/nfs
-+ /bin/mkdir -p $CTDB_BASE/state/nfs-kernel-server
- /bin/mkdir -p $CTDB_BASE/state/statd/ip
- /bin/mkdir -p $STATD_SHARED_DIRECTORY
-
- /bin/rm -f $CTDB_BASE/state/statd/statd.restart >/dev/null 2>/dev/null
-
- # make sure nfs is stopped before we start it, or it may get a bind error
-- service nfs stop > /dev/null 2>&1
-- service nfslock stop > /dev/null 2>&1
-+ service nfs-kernel-server stop > /dev/null 2>&1
-
-- service nfslock start
-- service nfs start
-+ service nfs-kernel-server start
- ;;
-
- shutdown)
- # shutting down nfs can take a while so put it in the background
-- service nfs stop &
-- service nfslock stop &
-+ service nfs-kernel-server stop &
- exit 0
- ;;
-
-Index: ctdb-1.0.25+git200801291431/config/events.d/61.nfstickle
-===================================================================
---- ctdb-1.0.25+git200801291431.orig/config/events.d/61.nfstickle 2008-02-03 20:44:30.000000000 +0100
-+++ ctdb-1.0.25+git200801291431/config/events.d/61.nfstickle 2008-02-03 21:28:28.000000000 +0100
-@@ -4,7 +4,7 @@
- PATH=/bin:/usr/bin:$PATH
-
- . $CTDB_BASE/functions
--loadconfig nfs
-+loadconfig nfs-kernel-server
-
- cmd="$1"
- shift
-Index: ctdb-1.0.25+git200801291431/config/events.d/50.samba
-===================================================================
---- ctdb-1.0.25+git200801291431.orig/config/events.d/50.samba 2008-02-03 21:28:46.000000000 +0100
-+++ ctdb-1.0.25+git200801291431/config/events.d/50.samba 2008-02-03 21:29:32.000000000 +0100
-@@ -45,7 +45,7 @@
- /bin/mkdir -p $CTDB_BASE/state/samba
-
- # make sure samba is not already started
-- service smb stop > /dev/null 2>&1
-+ service samba stop > /dev/null 2>&1
- killall -0 -q smbd && {
- sleep 1
- # make absolutely sure samba is dead
-@@ -66,7 +66,7 @@
- # start Samba service. Start it reniced, as under very heavy load
- # the number of smbd processes will mean that it leaves few cycles for
- # anything else
-- nice service smb start
-+ nice service samba start
- ;;
-
- takeip)
-@@ -84,7 +84,7 @@
-
- shutdown)
- # shutdown Samba when ctdb goes down
-- service smb stop
-+ service samba stop
-
- # stop the winbind service
- [ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
Added: trunk/ctdb/debian/patches/05_nice_service.diff
===================================================================
--- trunk/ctdb/debian/patches/05_nice_service.diff (rev 0)
+++ trunk/ctdb/debian/patches/05_nice_service.diff 2008-02-12 18:52:20 UTC (rev 1728)
@@ -0,0 +1,45 @@
+Goal: create a nice_service function
+
+/sbin/service is not in debian. So ''nice service'' fails
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: reported as bugzilla bug #5258
+
+Index: ctdb-1.0.28+git200802081512/config/events.d/50.samba
+===================================================================
+--- ctdb-1.0.28+git200802081512.orig/config/events.d/50.samba 2008-02-12 19:17:25.000000000 +0100
++++ ctdb-1.0.28+git200802081512/config/events.d/50.samba 2008-02-12 19:17:49.000000000 +0100
+@@ -66,7 +66,7 @@
+ # start Samba service. Start it reniced, as under very heavy load
+ # the number of smbd processes will mean that it leaves few cycles for
+ # anything else
+- nice service smb start
++ nice_service smb start
+ ;;
+
+ takeip)
+Index: ctdb-1.0.28+git200802081512/config/functions
+===================================================================
+--- ctdb-1.0.28+git200802081512.orig/config/functions 2008-02-12 19:17:16.000000000 +0100
++++ ctdb-1.0.28+git200802081512/config/functions 2008-02-12 19:18:52.000000000 +0100
+@@ -29,6 +29,19 @@
+ fi
+ }
+
++######################################################
++# simulate /sbin/service (niced) on platforms that don't have it
++nice_service() {
++ service_name="$1"
++ op="$2"
++ if [ -x /sbin/service ]; then
++ nice /sbin/service "$service_name" "$op"
++ elif [ -x /etc/init.d/$service_name ]; then
++ nice /etc/init.d/$service_name "$op"
++ elif [ -x /etc/rc.d/init.d/$service_name ]; then
++ nice /etc/rc.d/init.d/$service_name "$op"
++ fi
++}
+
+ ######################################################
+ # wait for a command to return a zero exit status
Copied: trunk/ctdb/debian/patches/06_services_names.diff (from rev 1727, trunk/ctdb/debian/patches/05_init_names.diff)
===================================================================
--- trunk/ctdb/debian/patches/06_services_names.diff (rev 0)
+++ trunk/ctdb/debian/patches/06_services_names.diff 2008-02-12 18:52:20 UTC (rev 1728)
@@ -0,0 +1,129 @@
+Goal: correct various paths in events scripts
+
+Services have different names :
+* http -> apache2
+* nfs -> nfs-kernel-server
+* smb -> samba
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: specific to debian
+
+Index: ctdb-1.0.25+git200801291431/config/events.d/41.httpd
+===================================================================
+--- ctdb-1.0.25+git200801291431.orig/config/events.d/41.httpd 2008-02-03 20:44:30.000000000 +0100
++++ ctdb-1.0.25+git200801291431/config/events.d/41.httpd 2008-02-03 21:28:28.000000000 +0100
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+-# event strict to manage httpd in a cluster environment
++# event strict to manage apache2 in a cluster environment
+
+ . $CTDB_BASE/functions
+ loadconfig ctdb
+-loadconfig http
++loadconfig apache2
+
+ [ "$CTDB_MANAGES_HTTPD" = "yes" ] || exit 0
+
+@@ -12,12 +12,12 @@
+
+ case $cmd in
+ startup)
+- service httpd stop > /dev/null 2>&1
+- service httpd start
++ service apache2 stop > /dev/null 2>&1
++ service apache2 start
+ ;;
+
+ shutdown)
+- service httpd stop
++ service apache2 stop
+ ;;
+
+ monitor)
+Index: ctdb-1.0.25+git200801291431/config/events.d/60.nfs
+===================================================================
+--- ctdb-1.0.25+git200801291431.orig/config/events.d/60.nfs 2008-02-03 20:44:30.000000000 +0100
++++ ctdb-1.0.25+git200801291431/config/events.d/60.nfs 2008-02-03 21:28:28.000000000 +0100
+@@ -2,7 +2,7 @@
+ # script to manage nfs in a clustered environment
+
+ . $CTDB_BASE/functions
+-loadconfig nfs
++loadconfig nfs-kernelc
+
+ [ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
+ [ -z "$STATD_SHARED_DIRECTORY" ] && exit 0
+@@ -14,24 +14,21 @@
+
+ case $cmd in
+ startup)
+- /bin/mkdir -p $CTDB_BASE/state/nfs
++ /bin/mkdir -p $CTDB_BASE/state/nfs-kernel-server
+ /bin/mkdir -p $CTDB_BASE/state/statd/ip
+ /bin/mkdir -p $STATD_SHARED_DIRECTORY
+
+ /bin/rm -f $CTDB_BASE/state/statd/statd.restart >/dev/null 2>/dev/null
+
+ # make sure nfs is stopped before we start it, or it may get a bind error
+- service nfs stop > /dev/null 2>&1
+- service nfslock stop > /dev/null 2>&1
++ service nfs-kernel-server stop > /dev/null 2>&1
+
+- service nfslock start
+- service nfs start
++ service nfs-kernel-server start
+ ;;
+
+ shutdown)
+ # shutting down nfs can take a while so put it in the background
+- service nfs stop &
+- service nfslock stop &
++ service nfs-kernel-server stop &
+ exit 0
+ ;;
+
+Index: ctdb-1.0.25+git200801291431/config/events.d/61.nfstickle
+===================================================================
+--- ctdb-1.0.25+git200801291431.orig/config/events.d/61.nfstickle 2008-02-03 20:44:30.000000000 +0100
++++ ctdb-1.0.25+git200801291431/config/events.d/61.nfstickle 2008-02-03 21:28:28.000000000 +0100
+@@ -4,7 +4,7 @@
+ PATH=/bin:/usr/bin:$PATH
+
+ . $CTDB_BASE/functions
+-loadconfig nfs
++loadconfig nfs-kernel-server
+
+ cmd="$1"
+ shift
+Index: ctdb-1.0.25+git200801291431/config/events.d/50.samba
+===================================================================
+--- ctdb-1.0.25+git200801291431.orig/config/events.d/50.samba 2008-02-03 21:28:46.000000000 +0100
++++ ctdb-1.0.25+git200801291431/config/events.d/50.samba 2008-02-03 21:29:32.000000000 +0100
+@@ -45,7 +45,7 @@
+ /bin/mkdir -p $CTDB_BASE/state/samba
+
+ # make sure samba is not already started
+- service smb stop > /dev/null 2>&1
++ service samba stop > /dev/null 2>&1
+ killall -0 -q smbd && {
+ sleep 1
+ # make absolutely sure samba is dead
+@@ -66,7 +66,7 @@
+ # start Samba service. Start it reniced, as under very heavy load
+ # the number of smbd processes will mean that it leaves few cycles for
+ # anything else
+- nice_service smb start
++ nice_service samba start
+ ;;
+
+ takeip)
+@@ -84,7 +84,7 @@
+
+ shutdown)
+ # shutdown Samba when ctdb goes down
+- service smb stop
++ service samba stop
+
+ # stop the winbind service
+ [ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series 2008-02-12 11:38:30 UTC (rev 1727)
+++ trunk/ctdb/debian/patches/series 2008-02-12 18:52:20 UTC (rev 1728)
@@ -1,4 +1,5 @@
02_ctdb_diagnostics.diff
03_web.diff
04_install_chmod.patch
-05_init_names.diff
+05_nice_service.diff
+06_services_names.diff
More information about the Pkg-samba-maint
mailing list