diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-04-27 02:59:17 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-04-27 02:59:17 +0000 |
| commit | 85a53038778e8d0d7b8230aae72768b055f83037 (patch) | |
| tree | f578c43f0d679a4565ceeb9a1ca3279a9d7b9e47 | |
| parent | 1b4f150541efc659614f322ff4e0f06e89c610a5 (diff) | |
| download | postgresql-85a53038778e8d0d7b8230aae72768b055f83037.tar.gz postgresql-85a53038778e8d0d7b8230aae72768b055f83037.zip | |
-D switch to postmaster should override any PGDATA environment variable
that might be hanging about. Now it does ... amazing nobody noticed
this before ...
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 9505d3599f7..03f356bfc07 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.139 2000/04/12 17:15:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.140 2000/04/27 02:59:17 tgl Exp $ * * NOTES * @@ -1725,11 +1725,8 @@ BackendStartup(Port *port) putenv(envEntry[1]); sprintf(envEntry[2], "PG_USER=%s", port->user); putenv(envEntry[2]); - if (!getenv("PGDATA")) - { - sprintf(envEntry[3], "PGDATA=%s", DataDir); - putenv(envEntry[3]); - } + sprintf(envEntry[3], "PGDATA=%s", DataDir); + putenv(envEntry[3]); sprintf(envEntry[4], "IPC_KEY=%d", ipc_key); putenv(envEntry[4]); @@ -2175,11 +2172,8 @@ SSDataBase(bool startup) putenv(ssEntry[0]); sprintf(ssEntry[1], "POSTID=%d", NextBackendTag); putenv(ssEntry[1]); - if (!getenv("PGDATA")) - { - sprintf(ssEntry[2], "PGDATA=%s", DataDir); - putenv(ssEntry[2]); - } + sprintf(ssEntry[2], "PGDATA=%s", DataDir); + putenv(ssEntry[2]); sprintf(ssEntry[3], "IPC_KEY=%d", ipc_key); putenv(ssEntry[3]); |