Merge pull request #6984 from xcat2/master

Merge from master to 2.16 branch for 2.16.2 release. (2)
xcat2 · May 19, 2021 · 2570c7e · 2570c7e
2 parents 512ec72 + 76b3664
commit 2570c7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup
@@ -900,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);

diff --git a/xCAT-test/autotest/testcase/migration/sles_migration b/xCAT-test/autotest/testcase/migration/sles_migration
@@ -45,7 +45,7 @@ check:output=~\d\d:\d\d:\d\d
 cmd:xdsh $$CN "rm -rf /oldxcat"
 cmd:xdsh $$CN "mkdir -p /oldxcat"
 check:rc==0
-cmd:xdsh $$CN "zypper install bzip2"
+cmd:xdsh $$CN "zypper -n install bzip2"
 check:rc==0
 cmd:xdsh $$CN "cd /oldxcat;wget $$MIGRATION1_DEP"
 check:rc==0
@@ -164,7 +164,7 @@ check:output=~\d\d:\d\d:\d\d
 cmd:xdsh $$CN "rm -rf /oldxcat"
 cmd:xdsh $$CN "mkdir -p /oldxcat"
 check:rc==0
-cmd:xdsh $$CN "zypper install bzip2"
+cmd:xdsh $$CN "zypper -n install bzip2"
 check:rc==0
 cmd:xdsh $$CN "cd /oldxcat;wget $$MIGRATION2_CORE"
 check:rc==0