- reverted my last commit, apparenly "init" part of initscript should be

  as simple at it was.

Changed files:
    postgresql.init -> 1.66
    postgresql.sysconfig -> 1.21

diff --git a/postgresql.init b/postgresql.init
index 8566255edf057a1bab0f7047e5d6b47fc81e2376..8cabf3528d52664117a78e224c066f9fc25cf3e5 100644 (file)
--- a/postgresql.init
+++ b/postgresql.init
@@ -18,9 +18,6 @@ cd /
 # 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 @@ case "$action" in
                        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\"")'!'

diff --git a/postgresql.sysconfig b/postgresql.sysconfig
index 5f37ecfe834872f3284a4755cb4f0154276d22d5..e837eaa1a3b6d809e17d5e23c90c9e8586a4738d 100644 (file)
--- a/postgresql.sysconfig
+++ b/postgresql.sysconfig
@@ -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"