[SCM] CTDB repository - branch master updated - ctdb-1.0.69-16-g73a7b61

Ronnie Sahlberg sahlberg at samba.org
Fri Jan 16 09:49:53 GMT 2009 

The branch, master has been updated
       via  73a7b611bf2ef87e92d6b18c538a260aa988a2e5 (commit)
       via  22cafa88f59ebe50c11f5b65a414800db79405a9 (commit)
       via  02893e04154c0590b235082c5a6e5726ceb25dba (commit)
       via  62eccefc15e2ca737098980aa0b7d226df73a456 (commit)
       via  a98a3ff2aad59d51fca6a2f3e2bdcfc99e84fa70 (commit)
       via  826511f759c3bfa7c587c97786b955572039d2ac (commit)
       via  32eac6fc3cce2a9d0a38add56a8bb893e4a85076 (commit)
       via  cf1e46d734ed51b4ac2eb8a09f2f787ae5c51092 (commit)
       via  25dbefc92e7303a7b679a769eb06a7c25fdcf198 (commit)
       via  85e942a26f5e7d4584d31005ff88c36dca215a11 (commit)
       via  ef4caf6874436ff3f451b95586893e39a8cec1ad (commit)
       via  9661b7a4f3773d645d0525c4430e3cccf0f32eb5 (commit)
       via  b7290b0a8325021515a904ac60fa9afa019c9db1 (commit)
       via  cdea4893c24511ffc1a7338ca3eb6cfd86d68086 (commit)
      from  3b88f3dec5227e8579672974f7028fb356ee1d94 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 73a7b611bf2ef87e92d6b18c538a260aa988a2e5
Author: root <root at rcn1.VSOFS1.COM>
Date:   Fri Jan 16 10:13:53 2009 +1100

    new version

commit 22cafa88f59ebe50c11f5b65a414800db79405a9
Author: Michael Adam <obnox at samba.org>
Date:   Fri Dec 19 11:50:06 2008 +0100

    ctdb.init: add $network to RequiredStop to match RequiredStart.
    
    This is to make rpm checks (eg.g for SuSE systems) survive.
    
    Michael

commit 02893e04154c0590b235082c5a6e5726ceb25dba
Author: Andreas Schneider <anschneider at suse.de>
Date:   Wed Oct 29 14:12:04 2008 +0100

    Fix circular dependency error with autoconf 2.6.3.
    
    Signed-off-by: Andreas Schneider <anschneider at suse.de>
    (cherry picked from commit b39611c36bb904774fd4032bf2f8003fbdeb5d34)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit 62eccefc15e2ca737098980aa0b7d226df73a456
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 16:01:49 2008 +0100

    makerpms: fix creation of tarball when gzip does not know "--rsynceable"
    
    --rsynceable is a patch to gzip that not all distributors / packagers
    add to gzip. (It has just bitten me on openSUSE.) This path first detects
    whether gzip knows about --rsynceable and then calls gzip accordingly.
    
    Michael

commit a98a3ff2aad59d51fca6a2f3e2bdcfc99e84fa70
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 12:18:09 2008 +0100

    ctdb.spec: fix version and (RPM-)release number.
    
    Originally, 1.0 was the version in the spec file and 68 was the release.
    But in fact everyone talked about ctdb version 1.0.68.
    This puts this straight...
    
    Michael

commit 826511f759c3bfa7c587c97786b955572039d2ac
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 12:17:15 2008 +0100

    makerpms: confess
    
    Michael

commit 32eac6fc3cce2a9d0a38add56a8bb893e4a85076
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 12:15:34 2008 +0100

    makerpms: don't hard-code the version number but extract it from ctdb.spec
    
    Michael

commit cf1e46d734ed51b4ac2eb8a09f2f787ae5c51092
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 12:13:42 2008 +0100

    makerpms: remove the need of calling makerpms.sh from the top level directory
    
    Instead, extract needed information from the dirname of the invoked name.
    
    Michael

commit 25dbefc92e7303a7b679a769eb06a7c25fdcf198
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 12:12:17 2008 +0100

    makerpms: don't cd to $SPECDIR but rpmbuild -ba $SPECDIR/$SPECFILE instead
    
    Michael

commit 85e942a26f5e7d4584d31005ff88c36dca215a11
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 12:09:13 2008 +0100

    makerpms: catch error of git archive correctly (echo resets $?)
    
    Michael

commit ef4caf6874436ff3f451b95586893e39a8cec1ad
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 12:06:25 2008 +0100

    makerpms: move comment to appropriate place
    
    Michael

commit 9661b7a4f3773d645d0525c4430e3cccf0f32eb5
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 12:05:05 2008 +0100

    makerpms: use variable (SPECFILE) that is available instead of hard coded file name
    
    Michael

commit b7290b0a8325021515a904ac60fa9afa019c9db1
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 16 00:30:55 2008 +0100

    doc: join broken lines in excerpt from log.ctdb
    
    Michael

commit cdea4893c24511ffc1a7338ca3eb6cfd86d68086
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 16 00:17:04 2008 +0100

    ctdb.samba.org: fix instruction for turning off samba service autostart
    
    Extend to show valid commands on Redhat and SuSE Linux.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 config/ctdb.init             |    2 +-
 doc/recovery-process.txt     |  144 ++++++++++++++----------------------------
 lib/replace/autoconf-2.60.m4 |    2 +
 packaging/RPM/ctdb.spec      |   14 ++++-
 packaging/RPM/makerpms.sh    |   34 ++++++----
 web/samba.html               |   10 +++-
 6 files changed, 91 insertions(+), 115 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 0d0053e..8168b1c 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -12,7 +12,7 @@
 ### BEGIN INIT INFO
 # Provides:            ctdb
 # Required-Start:      $network
-# Required-Stop:
+# Required-Stop:       $network
 # Default-Stop:
 # Default-Start:       3 5
 # Short-Description:   start and stop ctdb service
diff --git a/doc/recovery-process.txt b/doc/recovery-process.txt
index d0294a3..7780d84 100644
--- a/doc/recovery-process.txt
+++ b/doc/recovery-process.txt
@@ -376,104 +376,56 @@ only be present if an error occured.
 
 Example : RECOVERY LOG ON RECMASTER
 ====================================
-2008/12/01 09:57:28.110732 [ 4933]: 10.0.0.21:4379: node 10.0.0.24:4379 is dead:
- 2 connected
+2008/12/01 09:57:28.110732 [ 4933]: 10.0.0.21:4379: node 10.0.0.24:4379 is dead: 2 connected
 2008/12/01 09:57:28.110838 [ 4933]: Tearing down connection to dead node :3
-2008/12/01 09:57:28.967297 [ 4935]: server/ctdb_recoverd.c:2682 The vnnmap count
- is different from the number of active nodes. 4 vs 3
-2008/12/01 09:57:28.967297 [ 4935]: server/ctdb_recoverd.c:1327 Starting do_reco
-very
-2008/12/01 09:57:28.967297 [ 4935]: ctdb_recovery_lock: Got recovery lock on '/g
-pfs/.ctdb/shared'
-2008/12/01 09:57:28.967297 [ 4935]: server/ctdb_recoverd.c:1355 Recovery initiat
-ed due to problem with node 0
-2008/12/01 09:57:28.967297 [ 4935]: server/ctdb_recoverd.c:1381 Recovery - creat
-ed remote databases
-2008/12/01 09:57:28.973543 [ 4933]: server/ctdb_recover.c:589 Recovery mode set 
-to ACTIVE
-2008/12/01 09:57:28.974823 [ 4933]: server/ctdb_recover.c:904 startrecovery even
-tscript has been invoked
-2008/12/01 09:57:29.187264 [ 4935]: server/ctdb_recoverd.c:1431 started transact
-ions on all nodes
-2008/12/01 09:57:29.187264 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0x42fe72c5
-2008/12/01 09:57:29.187264 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0x42fe72c5 of size 0
-2008/12/01 09:57:29.187264 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0x1421fb78
-2008/12/01 09:57:29.197262 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0x1421fb78 of size 0
-2008/12/01 09:57:29.197262 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0xc0bdde6a
-2008/12/01 09:57:29.197262 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0xc0bdde6a of size 0
-2008/12/01 09:57:29.197262 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0x17055d90
-2008/12/01 09:57:29.207261 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0x17055d90 of size 8
-2008/12/01 09:57:29.207261 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0x7bbbd26c
-2008/12/01 09:57:29.207261 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0x7bbbd26c of size 1
-2008/12/01 09:57:29.207261 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0xf2a58948
-2008/12/01 09:57:29.217259 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0xf2a58948 of size 51
-2008/12/01 09:57:29.217259 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0x92380e87
-2008/12/01 09:57:29.217259 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0x92380e87 of size 17
-2008/12/01 09:57:29.227258 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0x63501287
-2008/12/01 09:57:29.227258 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0x63501287 of size 1
-2008/12/01 09:57:29.227258 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0xe98e08b6
-2008/12/01 09:57:29.227258 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0xe98e08b6 of size 4
-2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0x2672a57f
-2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0x2672a57f of size 28
-2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulle
-d remote database 0xb775fff6
-2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushe
-d remote database 0xb775fff6 of size 6
-2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1440 Recovery - start
-ing database commits
-2008/12/01 09:57:29.297247 [ 4935]: server/ctdb_recoverd.c:1452 Recovery - commi
-tted databases
-2008/12/01 09:57:29.297247 [ 4935]: server/ctdb_recoverd.c:1502 Recovery - updat
-ed vnnmap
-2008/12/01 09:57:29.297247 [ 4935]: server/ctdb_recoverd.c:1511 Recovery - updat
-ed recmaster
-2008/12/01 09:57:29.297247 [ 4935]: server/ctdb_recoverd.c:1522 Recovery - updat
-ed flags
-2008/12/01 09:57:29.305235 [ 4933]: server/ctdb_recover.c:589 Recovery mode set 
-to NORMAL
-2008/12/01 09:57:29.307245 [ 4935]: server/ctdb_recoverd.c:1531 Recovery - disab
-led recovery mode
-2008/12/01 09:57:29.307245 [ 4935]: Deterministic IPs enabled. Resetting all ip 
-allocations
-2008/12/01 09:57:29.311071 [ 4933]: takeoverip called for an ip '10.0.0.201' tha
-t is not a public address
-2008/12/01 09:57:29.311186 [ 4933]: takeoverip called for an ip '10.0.0.202' tha
-t is not a public address
-2008/12/01 09:57:29.311204 [ 4933]: takeoverip called for an ip '10.0.0.203' tha
-t is not a public address
-2008/12/01 09:57:29.311299 [ 4933]: takeoverip called for an ip '10.0.0.204' tha
-t is not a public address
-2008/12/01 09:57:29.537210 [ 4935]: server/ctdb_recoverd.c:1542 Recovery - takei
-p finished
+2008/12/01 09:57:28.967297 [ 4935]: server/ctdb_recoverd.c:2682 The vnnmap count is different from the number of active nodes. 4 vs 3
+2008/12/01 09:57:28.967297 [ 4935]: server/ctdb_recoverd.c:1327 Starting do_recovery
+2008/12/01 09:57:28.967297 [ 4935]: ctdb_recovery_lock: Got recovery lock on '/gpfs/.ctdb/shared'
+2008/12/01 09:57:28.967297 [ 4935]: server/ctdb_recoverd.c:1355 Recovery initiated due to problem with node 0
+2008/12/01 09:57:28.967297 [ 4935]: server/ctdb_recoverd.c:1381 Recovery - created remote databases
+2008/12/01 09:57:28.973543 [ 4933]: server/ctdb_recover.c:589 Recovery mode set to ACTIVE
+2008/12/01 09:57:28.974823 [ 4933]: server/ctdb_recover.c:904 startrecovery eventscript has been invoked
+2008/12/01 09:57:29.187264 [ 4935]: server/ctdb_recoverd.c:1431 started transactions on all nodes
+2008/12/01 09:57:29.187264 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0x42fe72c5
+2008/12/01 09:57:29.187264 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0x42fe72c5 of size 0
+2008/12/01 09:57:29.187264 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0x1421fb78
+2008/12/01 09:57:29.197262 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0x1421fb78 of size 0
+2008/12/01 09:57:29.197262 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0xc0bdde6a
+2008/12/01 09:57:29.197262 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0xc0bdde6a of size 0
+2008/12/01 09:57:29.197262 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0x17055d90
+2008/12/01 09:57:29.207261 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0x17055d90 of size 8
+2008/12/01 09:57:29.207261 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0x7bbbd26c
+2008/12/01 09:57:29.207261 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0x7bbbd26c of size 1
+2008/12/01 09:57:29.207261 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0xf2a58948
+2008/12/01 09:57:29.217259 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0xf2a58948 of size 51
+2008/12/01 09:57:29.217259 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0x92380e87
+2008/12/01 09:57:29.217259 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0x92380e87 of size 17
+2008/12/01 09:57:29.227258 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0x63501287
+2008/12/01 09:57:29.227258 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0x63501287 of size 1
+2008/12/01 09:57:29.227258 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0xe98e08b6
+2008/12/01 09:57:29.227258 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0xe98e08b6 of size 4
+2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0x2672a57f
+2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0x2672a57f of size 28
+2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1268 Recovery - pulled remote database 0xb775fff6
+2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1230 Recovery - pushed remote database 0xb775fff6 of size 6
+2008/12/01 09:57:29.237256 [ 4935]: server/ctdb_recoverd.c:1440 Recovery - starting database commits
+2008/12/01 09:57:29.297247 [ 4935]: server/ctdb_recoverd.c:1452 Recovery - committed databases
+2008/12/01 09:57:29.297247 [ 4935]: server/ctdb_recoverd.c:1502 Recovery - updated vnnmap
+2008/12/01 09:57:29.297247 [ 4935]: server/ctdb_recoverd.c:1511 Recovery - updated recmaster
+2008/12/01 09:57:29.297247 [ 4935]: server/ctdb_recoverd.c:1522 Recovery - updated flags
+2008/12/01 09:57:29.305235 [ 4933]: server/ctdb_recover.c:589 Recovery mode set to NORMAL
+2008/12/01 09:57:29.307245 [ 4935]: server/ctdb_recoverd.c:1531 Recovery - disabled recovery mode
+2008/12/01 09:57:29.307245 [ 4935]: Deterministic IPs enabled. Resetting all ip allocations
+2008/12/01 09:57:29.311071 [ 4933]: takeoverip called for an ip '10.0.0.201' that is not a public address
+2008/12/01 09:57:29.311186 [ 4933]: takeoverip called for an ip '10.0.0.202' that is not a public address
+2008/12/01 09:57:29.311204 [ 4933]: takeoverip called for an ip '10.0.0.203' that is not a public address
+2008/12/01 09:57:29.311299 [ 4933]: takeoverip called for an ip '10.0.0.204' that is not a public address
+2008/12/01 09:57:29.537210 [ 4935]: server/ctdb_recoverd.c:1542 Recovery - takeip finished
 2008/12/01 09:57:29.545404 [ 4933]: Recovery has finished
-2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1551 Recovery - finis
-hed the recovered event
-2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1557 Recovery complet
-e
-2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1565 New recoveries s
-upressed for the rerecovery timeout
-2008/12/01 09:57:39.815648 [ 4935]: server/ctdb_recoverd.c:1567 Rerecovery timeo
-ut elapsed. Recovery reactivated.
+2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1551 Recovery - finished the recovered event
+2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1557 Recovery complete
+2008/12/01 09:57:29.807169 [ 4935]: server/ctdb_recoverd.c:1565 New recoveries supressed for the rerecovery timeout
+2008/12/01 09:57:39.815648 [ 4935]: server/ctdb_recoverd.c:1567 Rerecovery timeout elapsed. Recovery reactivated.
 
 
 
diff --git a/lib/replace/autoconf-2.60.m4 b/lib/replace/autoconf-2.60.m4
index acdcd38..2d5dbc1 100644
--- a/lib/replace/autoconf-2.60.m4
+++ b/lib/replace/autoconf-2.60.m4
@@ -179,6 +179,7 @@ AC_DEFUN([AC_PROG_CC_C99],
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
 AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
 [
   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
@@ -208,3 +209,4 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
     AC_DEFINE([__EXTENSIONS__])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
 ])
+])
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 0f9ec08..b662a7d 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,8 +4,8 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
-Version: 1.0
-Release: 69
+Version: 1.0.70
+Release: 1
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -121,6 +121,16 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Fri Jan 16 2009 : Version 1.0.70
+ - IPv6 support is completed. this is backward compatible with ipv4-only
+   systems. To use IPv6 with samba and ctdb you need current GIT of samba 3.3
+   or michael adams samba-ctdeb branch.
+ - Many enhancements to the build system and scripts to make it more SUSE
+   friendly by Michael Adams.
+ - Change of how the naming of the package is structured. We are now
+   using "1.0.70" as a release and "-1" as the revision instead of as
+   previously using "1.0" as release and ".70" as the revision.
+   By Michael Adams.
 * Thu Dec 18 2008 : Version 1.0.69
  - Various fixes to scripts by M Adam
  - Dont call ctdb_fatal() when the transport is down during shutdown
diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh
index 7b5012a..3735b39 100755
--- a/packaging/RPM/makerpms.sh
+++ b/packaging/RPM/makerpms.sh
@@ -3,6 +3,7 @@
 #               Gerald (Jerry) Carter 2003
 #		Jim McDonough 2007
 #		Andrew Tridgell 2007
+#		Michael Adam 2008
 
 # The following allows environment variables to override the target directories
 #   the alternative is to have a file in your home directory calles .rpmmacros
@@ -15,42 +16,47 @@
 
 EXTRA_OPTIONS="$1"
 
-[ -d packaging ] || {
-    echo "Must run this from the ctdb directory"
-    exit 1
-}
-
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../..
 
 SPECDIR=`rpm --eval %_specdir`
 SRCDIR=`rpm --eval %_sourcedir`
 
-# At this point the SPECDIR and SRCDIR vaiables must have a value!
-
-VERSION='1.0'
-REVISION=''
 SPECFILE="ctdb.spec"
 RPMBUILD="rpmbuild"
 
+VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
+RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')
+
+if gzip --rsyncable 2>&1 ; then
+	GZIP="gzip -9 --rsyncable"
+else
+	GZIP="gzip -9"
+fi
+
+pushd ${TOPDIR}
 echo -n "Creating ctdb-${VERSION}.tar.gz ... "
-git archive --prefix=ctdb-${VERSION}/ HEAD | gzip -9 --rsyncable > ${SRCDIR}/ctdb-${VERSION}.tar.gz
+git archive --prefix=ctdb-${VERSION}/ HEAD | ${GZIP} > ${SRCDIR}/ctdb-${VERSION}.tar.gz
+RC=$?
+popd
 echo "Done."
-if [ $? -ne 0 ]; then
+if [ $RC -ne 0 ]; then
         echo "Build failed!"
         exit 1
 fi
 
+# At this point the SPECDIR and SRCDIR vaiables must have a value!
 
 ##
 ## copy additional source files
 ##
-cp -p packaging/RPM/ctdb.spec ${SPECDIR}
+cp -p ${DIRNAME}/${SPECFILE} ${SPECDIR}
 
 ##
 ## Build
 ##
 echo "$(basename $0): Getting Ready to build release package"
-cd ${SPECDIR}
-${RPMBUILD} -ba --clean --rmsource $EXTRA_OPTIONS $SPECFILE || exit 1
+${RPMBUILD} -ba --clean --rmsource ${EXTRA_OPTIONS} ${SPECDIR}/${SPECFILE} || exit 1
 
 echo "$(basename $0): Done."
 
diff --git a/web/samba.html b/web/samba.html
index b105b1d..c210f4b 100644
--- a/web/samba.html
+++ b/web/samba.html
@@ -65,10 +65,16 @@ A suitable file can be found in the dbench distribution at http://samba.org/ftp/
 <h3>CTDB_MANAGES_SAMBA</h3>
 This is a parameter in /etc/sysconfig/ctdb<br><br>
 When this parameter is set to "yes" CTDB will start/stop/restart the local samba daemon as the cluster configuration changes.<br><br>
-When this parameter is set you should also make sure that samba is NOT started by default by the linux system when it boots:
+When this parameter is set you should also make sure that samba is NOT started by default by the linux system when it boots, e.g.
 <pre>
-  chkconfig samba off
+  chkconfig smb off
 </pre>
+on a Redhat system and
+<pre>
+  chkconfig smb off
+  chkconfig nmb off
+</pre>
+on a SuSE system.
 
 Example:
 <pre>


-- 
CTDB repository

More information about the samba-cvs mailing list