diff options
| author | Peter Eisentraut | 2023-09-29 08:59:46 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2023-09-29 08:59:46 +0000 |
| commit | 5daa50f962bd06e49af690efc2a8a27fdd37fb7d (patch) | |
| tree | 635ab6d05a3f6b6f6545f56ccf163ea439344f1e | |
| parent | d40d8272190ce5f1641b9afb83a3752101af6a38 (diff) | |
Revert "pg_resetwal: Improve error with wrong/missing data directory"
This reverts commit 1d863c250461410e60c9ed5d3180f32336f4c3e2.
This broke specifying the data directory as a relative path.
Reported-by: Hayato Kuroda (Fujitsu) <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/TYAPR01MB58664AD301F511B1EA5B72B4F5C0A%40TYAPR01MB5866.jpnprd01.prod.outlook.com
| -rw-r--r-- | src/bin/pg_resetwal/pg_resetwal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c index 47e05bd2c95..04567f349d6 100644 --- a/src/bin/pg_resetwal/pg_resetwal.c +++ b/src/bin/pg_resetwal/pg_resetwal.c @@ -345,10 +345,6 @@ main(int argc, char *argv[]) get_restricted_token(); - if (chdir(DataDir) < 0) - pg_fatal("could not change directory to \"%s\": %m", - DataDir); - /* Set mask based on PGDATA permissions */ if (!GetDataDirectoryCreatePerm(DataDir)) pg_fatal("could not read permissions of directory \"%s\": %m", @@ -356,6 +352,10 @@ main(int argc, char *argv[]) umask(pg_mode_mask); + if (chdir(DataDir) < 0) + pg_fatal("could not change directory to \"%s\": %m", + DataDir); + /* Check that data directory matches our server version */ CheckDataVersion(); |