change the logic of clipping leases

[plcapi.git] / plc.d / postgresql

diff --git a/plc.d/postgresql b/plc.d/postgresql
index 18d9402..b61bf06 100755 (executable)
--- a/plc.d/postgresql
+++ b/plc.d/postgresql
@@ -59,7 +59,7 @@ case "$1" in
         touch $postgresql_sysconfig
         tmp=${postgresql_sysconfig}.new
         # remove any previous definitions and write ours
-        ( egrep -v '^(PGDATA=|PGLOG=|PGPORT=)' $postgresql_sysconfig
+        ( grep -v -E '^(PGDATA=|PGLOG=|PGPORT=)' $postgresql_sysconfig
             echo "PGDATA=$PGDATA"
             echo "PGLOG=/var/log/pgsql"
             echo "PGPORT=$PLC_DB_PORT"
@@ -72,15 +72,8 @@ case "$1" in
         # PostgreSQL must be started at least once to bootstrap
         # /var/lib/pgsql/data
         if [ ! -f $postgresql_conf ] ; then
-# fedora 16 uses systemd
-# http://docs.fedoraproject.org/en-US/Fedora/16/html/Release_Notes/sect-Release_Notes-Changes_for_Sysadmin.html
-            if type postgresql-setup >& /dev/null ; then
-                postgresql-setup initdb || :
-                check
-            else
-                sudo postgresql-setup --initdb --unit postgresql &> /dev/null || postgresql :
-                check
-            fi
+            postgresql-setup --initdb --unit postgresql &> /dev/null || :
+            check
         fi
 
         ######## /var/lib/pgsql/data/postgresql.conf