- small fixes

Changed files:
    postgresql.init -> 1.10
    postgresql.spec -> 1.29
    postgresql.sysconfig -> 1.3

diff --git a/postgresql.init b/postgresql.init
index 00d52accdc08997359a499df34528fd18df360e0..2031cd9bba9b5a3f4f756ed80eca79ddb5345254 100644 (file)
--- a/postgresql.init
+++ b/postgresql.init
@@ -44,11 +44,12 @@ case "$1" in
                su postgres -c "/usr/bin/postmaster \
                        $([ "$ALLOW_TCP_CONNECTIONS" = yes ] && echo "-i") \
                        $([ -n "$MAX_NUM_BACKENDS" ] && echo "-N $MAX_NUM_BACKENDS") \
-                       $([ -n "$POSTGRES_DATA_DIR" ] && echo "-D $POSTGRES_DATA_DIR") \
+                       $([ -n "POSTGRES_$DATA_DIR" ] && echo "-D $POSTGRES_DATA_DIR") \
                        -o \
                        $([ "$POSTGRES_QUIET" = yes ] && echo "-Q") \
-                       $([ "$POSTGRES_DIABLE_FSYNC" = yes ] && echo "-F") \
+                       $([ "$POSTGRES_DIABLE_FSYNC" = yes ] && echo "-F") " \
                        &
+               sleep 2
                if ps ax | grep -v grep | grep -q postmaster; then
                        deltext;ok
                else

diff --git a/postgresql.spec b/postgresql.spec
index 254058905dfd21e4f2feb60ff522fe164852c039..ffcb9a109bbc78e4ffe718be2dfb462dcdaafafe 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -417,7 +417,7 @@ gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/*
 /sbin/chkconfig --add postgresql
 
 # Create sample database
-if [ ! -f /var/state/psql/PG_VERSION ]; then
+if [ ! -f /var/state/pgsql/PG_VERSION ]; then
        su postgres -c "LD_LIBRARY_PATH=%{_libdir} \
                %{_bindir}/initdb --pgdata=/var/state/pgsql \
                --pglib=%{_libdir}/pgsql"
@@ -476,7 +476,7 @@ rm -f /tmp/tmp_perl_info
 %doc doc/*.ps.gz
 
 %attr(754,root,root) /etc/rc.d/init.d/*
-%attr(640,root,root) /etc/sysconfig/*
+%attr(644,root,root) /etc/sysconfig/*
 
 %attr(755,root,root) %{_bindir}/cleardbdir
 %attr(755,root,root) %{_bindir}/createdb

diff --git a/postgresql.sysconfig b/postgresql.sysconfig
index 8f9782233342bd37776729d2503cc00b0331d6b1..885370f73d758306b4d7696f13feeb97d1a2af6a 100644 (file)
--- a/postgresql.sysconfig
+++ b/postgresql.sysconfig
@@ -5,7 +5,7 @@
 ALLOW_TCP_CONNECTIONS=no
 
 # Root of the tree of database directories
-DATA_DIR=/var/state/pgsql
+POSTGRES_DATA_DIR=/var/state/pgsql
 
 # maximum number of backend server processes that this postmaster is allowed
 # to start. If not specyfied is 32, and can be set as high as 1024 if your