diff options
author | Peter Eisentraut <peter_e@gmx.net> | 2000-06-22 22:31:24 +0000 |
---|---|---|
committer | Peter Eisentraut <peter_e@gmx.net> | 2000-06-22 22:31:24 +0000 |
commit | c4465095659bb089e08f8c94ce045ba3572a194f (patch) | |
tree | 14b2fcbc9cf78738a235e4b9c7c38c1dce7656f3 /src/backend/bootstrap/bootstrap.c | |
parent | bc06269495c42ab7eb15a905d84374f78829a065 (diff) | |
download | postgresql-c4465095659bb089e08f8c94ce045ba3572a194f.tar.gz postgresql-c4465095659bb089e08f8c94ce045ba3572a194f.zip |
Second pass over run-time configuration system. Adjust priorities on some
option settings. Sort out SIGHUP vs BACKEND -- there is no total ordering
here, so make explicit checks. Add comments explaining all of this.
Removed permissions check on SHOW command.
Add examine_subclass to the game, rename to SQL_inheritance to fit the
official data model better. Adjust documentation.
Standalone backend needs to reset all options before it starts. To
facilitate that, have IsUnderPostmaster be set by the postmaster itself,
don't wait for the magic -p switch.
Also make sure that all environment variables and argv's survive
init_ps_display(). Use strdup where necessary.
Have initdb make configuration files (postgresql.conf, pg_hba.conf) mode
0600 -- having configuration files is no fun if you can't edit them.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
-rw-r--r-- | src/backend/bootstrap/bootstrap.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 532d1bc3a82..b49d5ef8bf3 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.86 2000/06/17 23:41:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.87 2000/06/22 22:31:17 petere Exp $ * *------------------------------------------------------------------------- */ @@ -35,6 +35,7 @@ #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/portal.h" @@ -248,8 +249,11 @@ BootstrapMain(int argc, char *argv[]) Quiet = false; Noversion = false; dbName = NULL; - DataDir = getenv("PGDATA"); /* Null if no PGDATA variable */ - IsUnderPostmaster = false; + if (!IsUnderPostmaster) + { + ResetAllOptions(); + DataDir = getenv("PGDATA"); /* Null if no PGDATA variable */ + } while ((flag = getopt(argc, argv, "D:dCQxpB:F")) != EOF) { @@ -275,7 +279,7 @@ BootstrapMain(int argc, char *argv[]) xloginit = true; break; case 'p': - IsUnderPostmaster = true; + /* indicates fork from postmaster */ break; case 'B': NBuffers = atoi(optarg); |