From d8bb3ea2db7dacdc5f91e2f11a7ee569d7c25c30 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 19 May 2021 15:30:49 -0400
Subject: [PATCH] Link file for all OSes

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

diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup
index f3449ea6b..3d0cd6fcf 100755
--- a/xCAT-client/bin/mysqlsetup
+++ b/xCAT-client/bin/mysqlsetup
@@ -146,8 +146,7 @@ if (-e "/etc/debian_version") {
 }
 
 # determine whether redhat or sles
-$::linuxos = xCAT::Utils->osver("all"); # returns "name,version.release"
-$::linuxos =~ tr/,//d; # remove comma separating release name and version numbers
+$::linuxos = xCAT::Utils->osver();
 
 # is this MariaDB or MySQL
 $::MariaDB = 0;
@@ -901,14 +900,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
-        if ($::linuxos eq "rhels7.7") {
-            my $resolveip="/usr/libexec/resolveip";
-            if (!(-x ($resolveip))) {
-                my $linkcmd="ln -s /usr/bin/resolveip $resolveip";
-                xCAT::Utils->runcmd($linkcmd, 0);
-            }
+        # On rhels7.7, /usr/bin/mysql_install_db requires /usr/libexec/resolveip
+        # Link it to /usr/bin/resolveip for all OSes, just in case some future releases have the same requirement
+        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);