The branch, master has been updated
via 0a6f9326cb99f14b5c9edd0d8854d8229df49910 (commit)
from 7a18f33ec7512100dd067c65f0470889ff8fd591 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0a6f9326cb99f14b5c9edd0d8854d8229df49910
Author: Ronnie Sahlberg <[EMAIL PROTECTED]>
Date: Thu Nov 20 16:39:56 2008 +1100
dont override/change CTDB_BASE if it is already set by the shell
-----------------------------------------------------------------------
Summary of changes:
server/ctdbd.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdbd.c b/server/ctdbd.c
index 8e15df0..b95aaca 100644
--- a/server/ctdbd.c
+++ b/server/ctdbd.c
@@ -300,9 +300,11 @@ int main(int argc, const char *argv[])
ctdb->do_setsched = !options.no_setsched;
- /* setup a environment variable for the event scripts to use to find the
- installation directory */
- setenv("CTDB_BASE", ETCDIR "/ctdb", 1);
+ if (getenv("CTDB_BASE") == NULL) {
+ /* setup a environment variable for the event scripts to use
+ to find the installation directory */
+ setenv("CTDB_BASE", ETCDIR "/ctdb", 1);
+ }
/* start the protocol running (as a child) */
return ctdb_start_daemon(ctdb, interactive?False:True);
--
CTDB repository
