1 files changed, 2 insertions, 50 deletions

diff --git a/meta-oe/recipes-support/postgresql/files/postgresql.init b/meta-oe/recipes-support/postgresql/files/postgresql.init
index ab46477606..4a4f0cd168 100644
--- a/meta-oe/recipes-support/postgresql/files/postgresql.init
+++ b/meta-oe/recipes-support/postgresql/files/postgresql.init
@@ -101,7 +101,7 @@ start(){
         else
                 # No existing PGDATA! Warn the user to initdb it.
                 echo
-                echo "$PGDATA is missing. Use \"service postgresql initdb\" to initialize the cluster first."
+                echo "$PGDATA is missing. Use \"postgresql-setup initdb\" to initialize the cluster first."
                 echo -n " [FAILED] "
                 echo
                 exit 1
@@ -160,51 +160,6 @@ reload(){
     $SU -l postgres -c "$PGENGINE/pg_ctl reload -D '$PGDATA' -s" > /dev/null 2>&1 < /dev/null
 }
 
-initdb(){
-    if [ -f "$PGDATA/PG_VERSION" ]
-    then
-        echo -n "Data directory is not empty!"
-        echo -n " [FAILED] "
-        echo
-        script_result=1
-    else
-        echo -n $"Initializing database: "
-        if [ ! -e "$PGDATA" -a ! -h "$PGDATA" ]
-        then
-                mkdir -p "$PGDATA" || exit 1
-                chown postgres:postgres "$PGDATA"
-                chmod go-rwx "$PGDATA"
-        fi
-        # Clean up SELinux tagging for PGDATA
-        [ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
-
-        # Make sure the startup-time log file is OK, too
-        if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
-        then
-                touch "$PGLOG" || exit 1
-                chown postgres:postgres "$PGLOG"
-                chmod go-rwx "$PGLOG"
-                [ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
-        fi
-
-        # Initialize the database
-        $SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident'" >> "$PGLOG" 2>&1 < /dev/null
-
-        # Create directory for postmaster log
-        mkdir "$PGDATA/pg_log"
-        chown postgres:postgres "$PGDATA/pg_log"
-        chmod go-rwx "$PGDATA/pg_log"
-
-        if [ -f "$PGDATA/PG_VERSION" ]
-        then
-            echo -n " [ OK ] "
-        else
-            echo -n " [FAILED] "
-            script_result=1
-        fi
-        echo
-    fi
-}
 
 # See how we were called.
 case "$1" in
@@ -230,11 +185,8 @@ case "$1" in
   force-reload)
         restart
         ;;
-  initdb)
-        initdb
-        ;;
   *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|initdb}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
         exit 2
 esac