xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7348 from gurevichmark/rhel9_yum_repos

Browse Source 
Fix RHEL9 yum repo paths for ospkgs and otherpkgs
This commit is contained in:
besawn 2023-02-28 17:15:48 -05:00 committed by GitHub
commit 33aa37ee2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xCAT/postscripts/ospkgs
View File

@ -261,7 +261,7 @@ do
# (1)for rhels6, there is one repodata in the os base dir; so keep it here, and handle the other cases below
# (2)for sles, we should specified the baseurl should be ./install/sles11/ppc64/1
# (3)for SL5, we should append the /SL
# (4)for rhels8, centos8, ol8, alma8 and rocky8 we should append /BaseOS and /AppStream to base directory
# (4)for rhels8/9, centos8/9, ol8/9, alma8/9 and rocky8/9 we should append /BaseOS and /AppStream to base directory
# (5) for other os, we just keep it here.
# For other pkg paths, we just keep it here.
if [ $dir == $default_pkgdir ] || [ $dir == "$default_pkgdir/" ]; then
@ -273,12 +273,12 @@ do
ospkgdir="$ospkgdir/SL"
fi
fi
if ( ! pmatch "$OSVER" "rhels8*" &&
! pmatch "$OSVER" "centos8*" &&
! pmatch "$OSVER" "rocky8*" &&
! pmatch "$OSVER" "alma8*" &&
! pmatch "$OSVER" "ol8*"); then
# For rhels8, centos8, ol8, alma8 and rocky8 do not put $ospkgdir by itself
if ( ! pmatch "$OSVER" "rhels[89]*" &&
! pmatch "$OSVER" "centos[89]*" &&
! pmatch "$OSVER" "rocky[89]*" &&
! pmatch "$OSVER" "alma[89]*" &&
! pmatch "$OSVER" "ol[89]*"); then
# For rhels8/9, centos8/9, ol8/9, alma8/9 and rocky8 do not put $ospkgdir by itself
array_set_element os_path $index $ospkgdir
fi
array_set_element os_path $index $ospkgdir
@ -345,12 +345,12 @@ do
array_set_element os_path $index $ospkgdir_ok
done
fi # x86_64
elif ( pmatch "$OSVER" "rhels8*" ||
pmatch "$OSVER" "centos8*" ||
pmatch "$OSVER" "rocky8*" ||
pmatch "$OSVER" "alma8*" ||
pmatch "$OSVER" "ol8*"); then
# for rhels8, centos8, ol8, alma8 and rocky8 the repodata is in ./BaseOS, ./AppStream, not in ./
elif ( pmatch "$OSVER" "rhels[89]*" ||
pmatch "$OSVER" "centos[89]*" ||
pmatch "$OSVER" "rocky[89]*" ||
pmatch "$OSVER" "alma[89]*" ||
pmatch "$OSVER" "ol[89]*"); then
# for rhels8/9, centos8/9, ol8/9, alma8/9 and rocky8/9 the repodata is in ./BaseOS, ./AppStream, not in ./
for arg in "BaseOS" "AppStream"
do
ospkgdir_ok="$ospkgdir/$arg"

26
xCAT/postscripts/otherpkgs
View File

@ -340,7 +340,7 @@ fi
# (1)for rhels6, there is one repodata in the os base dir; so keep it here, and handle the other cases below
# (2)for sles, we should specified the baseurl should be ./install/sles11/ppc64/1
# (3)for SL5, we should append the /SL
# (4)for rhels8, centos8, ol8, alma8 and rocky8 we should append /BaseOS and /AppStream to base directory
# (4)for rhels8/9, centos8/9, ol8/9, alma8/9 and rocky8/9 we should append /BaseOS and /AppStream to base directory
# (5) for other os, we just keep it here.
# For other pkg paths, we just keep it here.
if [ $dir == $default_pkgdir ] || [ $dir == "$default_pkgdir/" ]; then
@ -352,12 +352,12 @@ fi
ospkgdir="$ospkgdir/SL"
fi
fi
if ( ! pmatch "$OSVER" "rhels8*" &&
! pmatch "$OSVER" "centos8*" &&
! pmatch "$OSVER" "rocky8*" &&
! pmatch "$OSVER" "alma8*" &&
! pmatch "$OSVER" "ol8*"); then
# For rhels8, centos8, ol8, and rocky8 do not put $ospkgdir by itself
if ( ! pmatch "$OSVER" "rhels[89]*" &&
! pmatch "$OSVER" "centos[89]*" &&
! pmatch "$OSVER" "rocky[89]*" &&
! pmatch "$OSVER" "alma[89]*" &&
! pmatch "$OSVER" "ol[89]*"); then
# For rhels8/9, centos8/9, ol8/9, and rocky8/9 do not put $ospkgdir by itself
array_set_element os_path $index $ospkgdir
fi
@ -398,12 +398,12 @@ fi
array_set_element os_path $index $ospkgdir_ok
done
fi # x86_64
elif ( pmatch "$OSVER" "rhels8*" ||
pmatch "$OSVER" "centos8*" ||
pmatch "$OSVER" "rocky8*" ||
pmatch "$OSVER" "alma8*" ||
pmatch "$OSVER" "ol8*"); then
# for rhels8, centos8, ol8, alma8 and rocky8 the repodata is in ./BaseOS, ./AppStream, not in ./
elif ( pmatch "$OSVER" "rhels[89]*" ||
pmatch "$OSVER" "centos[89]*" ||
pmatch "$OSVER" "rocky[89]*" ||
pmatch "$OSVER" "alma[89]*" ||
pmatch "$OSVER" "ol[89]*"); then
# for rhels8/9, centos8/9, ol8/9, alma8/9 and rocky8/9 the repodata is in ./BaseOS, ./AppStream, not in ./
for arg in "BaseOS" "AppStream"
do
ospkgdir_ok="$ospkgdir/$arg"