From 5daa50f962bd06e49af690efc2a8a27fdd37fb7d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 29 Sep 2023 10:59:46 +0200 Subject: [PATCH] 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) Discussion: https://www.postgresql.org/message-id/flat/TYAPR01MB58664AD301F511B1EA5B72B4F5C0A%40TYAPR01MB5866.jpnprd01.prod.outlook.com --- src/bin/pg_resetwal/pg_resetwal.c | 8 ++++---- 1 file 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(); -- 2.39.5