Correct path where to check for password file existance.

petere · petere · commit 257e17bc60fb · 2001-01-04T17:25:09.000Z
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
@@ -24,7 +24,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.118 2000/12/31 22:24:14 tgl Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.119 2001/01/04 17:25:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -533,7 +533,7 @@ if [ "$PwPrompt" ]; then
     fi
     echo "ALTER USER \"$POSTGRES_SUPERUSERNAME\" WITH PASSWORD '$FirstPw'" \
 	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
-    if [ ! -f $PGDATA/pg_pwd ]; then
+    if [ ! -f $PGDATA/global/pg_pwd ]; then
         echo "The password file wasn't generated. Please report this problem." 1>&2
         exit_nicely
     fi

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#`
`25`	`25`	`# Copyright (c) 1994, Regents of the University of California`
`26`	`26`	`#`
`27`		`-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.118 2000/12/31 22:24:14 tgl Exp $`
	`27`	`+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.119 2001/01/04 17:25:09 petere Exp $`
`28`	`28`	`#`
`29`	`29`	`#-------------------------------------------------------------------------`
`30`	`30`
`@@ -533,7 +533,7 @@ if [ "$PwPrompt" ]; then`
`533`	`533`	`fi`
`534`	`534`	`echo "ALTER USER \"$POSTGRES_SUPERUSERNAME\" WITH PASSWORD '$FirstPw'" \`
`535`	`535`	`\| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null \|\| exit_nicely`
`536`		`- if [ ! -f $PGDATA/pg_pwd ]; then`
	`536`	`+ if [ ! -f $PGDATA/global/pg_pwd ]; then`
`537`	`537`	`echo "The password file wasn't generated. Please report this problem." 1>&2`
`538`	`538`	`exit_nicely`
`539`	`539`	`fi`