SOURCES: postgresql.init, postgresql.sysconfig - reverted my last ...

[romke]

Author: romke                        Date: Sat Jul 23 18:09:31 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverted my last commit, apparenly "init" part of initscript should be
  as simple at it was.

---- Files affected:
SOURCES:
   postgresql.init (1.65 -> 1.66) , postgresql.sysconfig (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SOURCES/postgresql.init
diff -u SOURCES/postgresql.init:1.65 SOURCES/postgresql.init:1.66
--- SOURCES/postgresql.init:1.65	Sat Jul 23 15:30:44 2005
+++ SOURCES/postgresql.init	Sat Jul 23 20:09:26 2005
@@ -18,9 +18,6 @@
 # Get network config
 . /etc/sysconfig/network
 
-# Preconfigure some variables:
-PG_INITDB_ENCODING=UNICODE
-
 # Get service config
 if [ -f /etc/sysconfig/postgresql ]; then
 	. /etc/sysconfig/postgresql
@@ -219,12 +216,7 @@
 			mkdir -p $pgdir
 			chmod 700 $pgdir
 			chown postgres:postgres $pgdir
-			if [ "x${PG_INITDB_ENCODING}x" != "xx" ]; then
-				TMPENC="-E ${PG_INITDB_ENCODING}"
-			else
-				TMPENC=
-			fi
-			TMPDIR=/tmp su postgres -s /bin/sh -c "initdb ${TMPENC} -D $pgdir"
+			TMPDIR=/tmp su postgres -s /bin/sh -c "initdb -E UNICODE -D $pgdir"
 		fi
 	done
 	echo $(nls "REMEMBER to setup password for user \"postgres\"")'!'

================================================================
Index: SOURCES/postgresql.sysconfig
diff -u SOURCES/postgresql.sysconfig:1.20 SOURCES/postgresql.sysconfig:1.21
--- SOURCES/postgresql.sysconfig:1.20	Sat Jul 23 15:30:44 2005
+++ SOURCES/postgresql.sysconfig	Sat Jul 23 20:09:26 2005
@@ -6,11 +6,6 @@
 # you should change TCP/IP port, at least.
 #
 
-# if you want change default initdb encoding use (value WITHOUT QUOTES!):
-# PG_INITDB_ENCODING=UNICODE
-# e.g. if you want use database default encoding use:
-# PG_INITDB_ENCODING=
-
 # standard setting
 PG_DB_CLUSTERS="/var/lib/pgsql"
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/postgresql.init?r1=1.65&r2=1.66&f=u
    http://cvs.pld-linux.org/SOURCES/postgresql.sysconfig?r1=1.20&r2=1.21&f=u