From a7a5186a4ed1d17c5d38f7c9eadf8cb6b7169687 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 18 Nov 2019 09:51:34 -0500 Subject: [PATCH] Adjust otherpkgs repo for rhel8/centos8 This fixes the script not completing successfully --- xCAT/postscripts/otherpkgs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs index 1161d1836..0e4b05964 100755 --- a/xCAT/postscripts/otherpkgs +++ b/xCAT/postscripts/otherpkgs @@ -386,8 +386,32 @@ fi array_set_element os_path $index $ospkgdir_ok done fi # x86_64 + elif ( pmatch "$OSVER" "rhels8*" ); then + if [ $ARCH == "x86_64" ]; then + for arg in "BasOS" "AppStream" + do + ospkgdir_ok="$ospkgdir/$arg" + array_set_element os_path $index $ospkgdir_ok + index=$(expr $index + 1) + done + fi # x86_64 fi # if...elif..fi fi # eq default_pkgdir + elif ( pmatch "$OSVER" "centos*" ); then + #default_pkgdir="$INSTALLDIR/$OSVER/$ARCH" + if [ $dir == $default_pkgdir ] || [ $dir == "$default_pkgdir/" ]; then + + if ( pmatch "$OSVER" "centos8*" ); then + if [ $ARCH == "x86_64" ]; then + for arg in "BaseOS" "AppStream" + do + ospkgdir_ok="$ospkgdir/$arg" + array_set_element os_path $index $ospkgdir_ok + index=$(expr $index + 1) + done + fi + fi + fi fi # match rhel* index=$(expr $index + 1)