From 0240e7a4446141bd6c78f0fef673e828a2602e85 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 8 Oct 2015 14:33:16 -0400
Subject: [PATCH 1/2] failed to check postgresql package and ids

---
 xCAT-client/bin/pgsqlsetup | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/xCAT-client/bin/pgsqlsetup b/xCAT-client/bin/pgsqlsetup
index 2bc59e69b..64dcfab03 100755
--- a/xCAT-client/bin/pgsqlsetup
+++ b/xCAT-client/bin/pgsqlsetup
@@ -164,7 +164,7 @@ if ($::RUNCMD_RC != 0)
 #
 # check to see if postgresql is installed
 #
-my $cmd = "rpm -qa | grep postgresql";
+my $cmd = "rpm -q postgresql";
 if ($debianflag){
     $cmd = "dpkg -l | grep postgresql | awk '{print \$2}'";
 }
@@ -179,6 +179,20 @@ if ($::RUNCMD_RC != 0)
     xCAT::MsgUtils->message("E", " $cmd failed. $message");
     exit(1);
 }
+
+#
+#check to see if postgres user is created
+#
+my $cmd = "id postgres";
+my @output=xCAT::Utils->runcmd($cmd, 0);
+if ($::RUNCMD_RC != 0)
+{
+    my $message = "\nPostgreSQL user is not created, please make sure postgresql-server packages are installed.";
+
+    xCAT::MsgUtils->message("E", " $cmd failed. $message");
+    exit(1);
+}
+
 # check if 9.X release not built by us is installed,  setup different
 # SLES used default dir
 if  ( (grep(/postgresql9/, @output)) && ($::linuxos !~ /sles/) ){  # postgresql 9.x

From 6932f19ec1c53ee9eaa8d3e86abc4d131a28d8fe Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 8 Oct 2015 17:02:23 -0400
Subject: [PATCH 2/2] check postgresql-server instead of postgresql

---
 xCAT-client/bin/pgsqlsetup | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/xCAT-client/bin/pgsqlsetup b/xCAT-client/bin/pgsqlsetup
index 64dcfab03..2949732b0 100755
--- a/xCAT-client/bin/pgsqlsetup
+++ b/xCAT-client/bin/pgsqlsetup
@@ -164,7 +164,7 @@ if ($::RUNCMD_RC != 0)
 #
 # check to see if postgresql is installed
 #
-my $cmd = "rpm -q postgresql";
+my $cmd = "rpm -q postgresql-server";
 if ($debianflag){
     $cmd = "dpkg -l | grep postgresql | awk '{print \$2}'";
 }
@@ -180,18 +180,6 @@ if ($::RUNCMD_RC != 0)
     exit(1);
 }
 
-#
-#check to see if postgres user is created
-#
-my $cmd = "id postgres";
-my @output=xCAT::Utils->runcmd($cmd, 0);
-if ($::RUNCMD_RC != 0)
-{
-    my $message = "\nPostgreSQL user is not created, please make sure postgresql-server packages are installed.";
-
-    xCAT::MsgUtils->message("E", " $cmd failed. $message");
-    exit(1);
-}
 
 # check if 9.X release not built by us is installed,  setup different
 # SLES used default dir