Just bail out if one of the configuration files is missing. The hint

directs them to move over '*.conf' anyway.

1 files changed, 2 insertions, 7 deletions

diff --git a/postgresql.init b/postgresql.init
index 8217299..1dabe2b 100755
--- a/postgresql.init
+++ b/postgresql.init
@@ -41,21 +41,16 @@ checkconfig() {
 
     # Check for the existence of PostgreSQL's config files.
     local file
-    local status=0
     for file in postgresql pg_hba pg_ident ; do
         file="${PGDATA%/}/${file}.conf"
         if [ -f ${file} ] ; then
             checkpath -f -m 0600 -o postgres:postgres ${file}
         else
             eerror "${file} not found"
-            status=1
+            eerror "HINT: mv ${DATA_DIR%/}/*.conf ${PGDATA}"
+            return 1
         fi
     done
-    if [ ${status} -eq 1 ] ; then
-        eerror "HINT: Try:"
-        eerror "    mv ${DATA_DIR%/}/*.conf ${PGDATA}"
-        return 1
-    fi
 
     # Check the socket directory
     checkpath -d -m 0770 -o postgres:postgres ${socket_path}