From 68f2534b9802250ad5406ae491169bc06d1829b9 Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Wed, 4 Mar 2020 14:19:04 -0500
Subject: [PATCH 1/2] Modify mysqlsetup scripts on rhels7.7

---
 xCAT-client/bin/mysqlsetup | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup
index b9743c963..edce88e6b 100755
--- a/xCAT-client/bin/mysqlsetup
+++ b/xCAT-client/bin/mysqlsetup
@@ -928,6 +928,12 @@ sub initmysqldb
         }
 
         $cmd = "$sqlcmd --user=mysql";
+        #on rhels7.7, /usr/bin/mysql_install_db requires /usr/libexec/resolveip, 
+        #but it's available at the /usr/bin/resolveip
+        #use --force to grant table entries use ipaddress instead of hostname
+        if ($::linuxos == "rhels7.7") {
+            $cmd = "$cmd --force";
+        }
     }
     xCAT::Utils->runcmd($cmd, 0);
     if ($::RUNCMD_RC != 0)

From 1e7453e53937896441793764db58bbaaed9bf6ee Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Wed, 4 Mar 2020 16:02:34 -0500
Subject: [PATCH 2/2] change to symbol links instead force options

---
 xCAT-client/bin/mysqlsetup | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup
index edce88e6b..588db7011 100755
--- a/xCAT-client/bin/mysqlsetup
+++ b/xCAT-client/bin/mysqlsetup
@@ -930,9 +930,12 @@ sub initmysqldb
         $cmd = "$sqlcmd --user=mysql";
         #on rhels7.7, /usr/bin/mysql_install_db requires /usr/libexec/resolveip, 
         #but it's available at the /usr/bin/resolveip
-        #use --force to grant table entries use ipaddress instead of hostname
         if ($::linuxos == "rhels7.7") {
-            $cmd = "$cmd --force";
+            my $resolveip="/usr/libexec/resolveip";
+            if (!(-x ($resolveip))) {
+                my $linkcmd="ln -s /usr/bin/resolveip $resolveip";
+                xCAT::Utils->runcmd($linkcmd, 0);
+            }
         }
     }
     xCAT::Utils->runcmd($cmd, 0);