Reverse out XLogDir/-X write-ahead log handling, per discussion.

Original patch from Thomas.

1 files changed, 39 insertions, 85 deletions

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 37249c1f79c..f361d0ace75 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -27,7 +27,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.167 2002/08/17 13:04:15 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.168 2002/08/17 15:12:07 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -252,19 +252,6 @@ do
         -D*)
                 PGDATA=`echo $1 | sed 's/^-D//'`
                 ;;
-# Directory to hold WAL log files.
-        --pgxlog|-X)
-                PGXLOG="$2"
-                defined_pgxlog=yes
-                shift;;
-        --pgxlog=*)
-                PGXLOG=`echo $1 | sed 's/^--pgxlog=//'`
-                defined_pgxlog=yes
-                ;;
-        -X*)
-                PGXLOG=`echo $1 | sed 's/^-X//'`
-                defined_pgxlog=yes
-                ;;
 # The directory where the .bki input files are stored. Normally
 # they are in PREFIX/share and this option should be unnecessary.
         -L)
@@ -354,7 +341,6 @@ if [ "$usage" ]; then
     echo
     echo "Options:"
     echo " [-D, --pgdata] DATADIR       Location for this database cluster"
-    echo " [-X, --pgxlog] XLOGDIR       Location for the cluster transaction logs"
     echo "  -W, --pwprompt              Prompt for a password for the new superuser"
     if [ -n "$MULTIBYTE" ] ; then 
         echo "  -E, --encoding ENCODING     Set default encoding for new databases"
@@ -415,11 +401,6 @@ then
     exit 1
 fi
 
-if [ -z "$PGXLOG" ]
-then
-    PGXLOG="$PGDATA"/pg_xlog
-fi
-
 
 #-------------------------------------------------------------------------
 # Find the input files
@@ -437,7 +418,7 @@ then
   (
     echo
     echo "initdb variables:"
-    for var in PGDATA PGXLOG datadir PGPATH MULTIBYTE MULTIBYTEID \
+    for var in PGDATA datadir PGPATH MULTIBYTE MULTIBYTEID \
         POSTGRES_SUPERUSERNAME POSTGRES_BKI \
         POSTGRES_DESCR POSTGRESQL_CONF_SAMPLE \
 	PG_HBA_SAMPLE PG_IDENT_SAMPLE ; do
@@ -522,61 +503,44 @@ then
       echo "$CMDNAME: The directory $PGDATA exists but is not empty."
       echo "If you want to create a new database system, either remove or empty"
       echo "the directory $PGDATA or run initdb with"
-      echo "an argument for -D other than $PGDATA."
+      echo "an argument other than $PGDATA."
     ) 1>&2
     exit 1
-fi
-
-# find out if transaction log directory is empty
-pgxlog_contents=`ls -A "$PGXLOG" 2>/dev/null`
-if [ x"$pgxlog_contents" != x ]
-then
-    (
-      echo "$CMDNAME: The directory $PGXLOG exists but is not empty."
-      echo "If you want to create a new transaction log, either remove or empty"
-      echo "the directory $PGXLOG or run initdb with"
-      echo "an argument for -X other than $PGXLOG."
-    ) 1>&2
-    exit 1
-fi
-
-if [ ! -d "$PGDATA" ]; then
-    $ECHO_N "creating directory $PGDATA... "$ECHO_C
-    mkdir -p "$PGDATA" >/dev/null 2>&1 || mkdir "$PGDATA" || exit_nicely
-    made_new_pgdata=yes
-else
-    $ECHO_N "Fixing permissions on existing directory $PGDATA... "$ECHO_C
-chmod go-rwx "$PGDATA" || exit_nicely
-fi
-echo "ok"
-
-if [ ! -d "$PGXLOG" ]; then
-    $ECHO_N "creating directory $PGXLOG... "$ECHO_C
-    mkdir -p "$PGXLOG" >/dev/null 2>&1 || mkdir "$PGXLOG" || exit_nicely
-    made_new_pgxlog=yes
 else
-    $ECHO_N "Fixing permissions on existing directory $PGXLOG... "$ECHO_C
-chmod go-rwx "$PGXLOG" || exit_nicely
-fi
-echo "ok"
+    if [ ! -d "$PGDATA" ]; then
+        $ECHO_N "creating directory $PGDATA... "$ECHO_C
+        mkdir -p "$PGDATA" >/dev/null 2>&1 || mkdir "$PGDATA" || exit_nicely
+        made_new_pgdata=yes
+    else
+        $ECHO_N "Fixing permissions on existing directory $PGDATA... "$ECHO_C
+	chmod go-rwx "$PGDATA" || exit_nicely
+    fi
+    echo "ok"
 
-if [ ! -d "$PGDATA"/base ]
-then
-    $ECHO_N "creating directory $PGDATA/base... "$ECHO_C
-    mkdir "$PGDATA"/base || exit_nicely
-echo "ok"
-fi
-if [ ! -d "$PGDATA"/global ]
-then
-    $ECHO_N "creating directory $PGDATA/global... "$ECHO_C
-    mkdir "$PGDATA"/global || exit_nicely
-echo "ok"
-fi
-if [ ! -d "$PGDATA"/pg_clog ]
-then
-    $ECHO_N "creating directory $PGDATA/pg_clog... "$ECHO_C
-    mkdir "$PGDATA"/pg_clog || exit_nicely
-echo "ok"
+    if [ ! -d "$PGDATA"/base ]
+	then
+        $ECHO_N "creating directory $PGDATA/base... "$ECHO_C
+        mkdir "$PGDATA"/base || exit_nicely
+	echo "ok"
+    fi
+    if [ ! -d "$PGDATA"/global ]
+    then
+        $ECHO_N "creating directory $PGDATA/global... "$ECHO_C
+        mkdir "$PGDATA"/global || exit_nicely
+	echo "ok"
+    fi
+    if [ ! -d "$PGDATA"/pg_xlog ]
+    then
+        $ECHO_N "creating directory $PGDATA/pg_xlog... "$ECHO_C
+        mkdir "$PGDATA"/pg_xlog || exit_nicely
+	echo "ok"
+    fi
+    if [ ! -d "$PGDATA"/pg_clog ]
+    then
+        $ECHO_N "creating directory $PGDATA/pg_clog... "$ECHO_C
+        mkdir "$PGDATA"/pg_clog || exit_nicely
+	echo "ok"
+    fi
 fi
 
 
@@ -585,7 +549,7 @@ fi
 # RUN BKI SCRIPT IN BOOTSTRAP MODE TO CREATE TEMPLATE1
 
 # common backend options
-PGSQL_OPT="-F -D$PGDATA -X$PGXLOG"
+PGSQL_OPT="-F -D$PGDATA"
 
 if [ "$debug" = yes ]
 then
@@ -1130,24 +1094,14 @@ echo "ok"
 #
 # FINISHED
 
-postmaster_startup="$PGPATH/postmaster -D $PGDATA"
-if [ x"$defined_pgxlog" != x ]; then
-    postmaster_startup="$postmaster_startup -X $PGXLOG"
-fi
-pg_ctl_startup="$PGPATH/pg_ctl -D $PGDATA"
-if [ x"$defined_pgxlog" != x ]; then
-    pg_ctl_startup="$pg_ctl_startup -X $PGXLOG"
-fi
-pg_ctl_startup="$pg_ctl_startup -l logfile start"
-
 echo
 echo "Success. You can now start the database server using:"
 echo ""
-echo "    $postmaster_startup"
+echo "    $PGPATH/postmaster -D $PGDATA"
 echo "or"
 # (Advertise -l option here, otherwise we have a background
 #  process writing to the terminal.)
-echo "    $pg_ctl_startup"
+echo "    $PGPATH/pg_ctl -D $PGDATA -l logfile start"
 echo
 
 exit 0