diff options
| author | Bruce Momjian <bruce@momjian.us> | 2015-04-01 18:25:45 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2015-04-01 18:25:45 -0400 |
| commit | a0efc714531d3dfd02fafd39e80d058cef6703b0 (patch) | |
| tree | b5c0f814bd4be0377ec94fedcfb3741b50ae13fa | |
| parent | 89840d7d3fa943cb932f6a00707fdb17a9cab001 (diff) | |
| download | postgresql-a0efc714531d3dfd02fafd39e80d058cef6703b0.tar.gz postgresql-a0efc714531d3dfd02fafd39e80d058cef6703b0.zip | |
pg_upgrade: call 'postgres' binary to get data directory location
This matches the binary 'pg_ctl' calls. Previously we called the
'postmaster'.
Report by Christoph Berg
| -rw-r--r-- | contrib/pg_upgrade/option.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c index 9b387be21d7..742d133e391 100644 --- a/contrib/pg_upgrade/option.c +++ b/contrib/pg_upgrade/option.c @@ -415,7 +415,7 @@ adjust_data_dir(ClusterInfo *cluster) * so this might fail --- only works for PG 9.2+. If this fails, * pg_upgrade will fail anyway because the data files will not be found. */ - snprintf(cmd, sizeof(cmd), "\"%s/postmaster\" -D \"%s\" -C data_directory", + snprintf(cmd, sizeof(cmd), "\"%s/postgres\" -D \"%s\" -C data_directory", cluster->bindir, cluster->pgconfig); if ((output = popen(cmd, "r")) == NULL || |