Merge pull request #12 from dz00te/main

add multi-arch fix
This commit is contained in:
Louis Abel 2021-05-06 12:23:57 -07:00 committed by GitHub
commit d49e7a4f43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -33,7 +33,8 @@ export LANG=en_US.UTF-8
SUPPORTED_RELEASE="8.3" SUPPORTED_RELEASE="8.3"
SUPPORTED_MAJOR="8" SUPPORTED_MAJOR="8"
current_url="https://dl.rockylinux.org/pub/rocky/${SUPPORTED_RELEASE}/BaseOS/x86_64/os/Packages" ARCH=$(arch)
current_url="https://dl.rockylinux.org/pub/rocky/${SUPPORTED_RELEASE}/BaseOS/${ARCH}/os/Packages"
# These are packages that can be swapped safely over and will have more added over time. # These are packages that can be swapped safely over and will have more added over time.
packages_to_swap=( packages_to_swap=(
centos-backgrounds \ centos-backgrounds \
@ -136,6 +137,14 @@ sig_swaps() {
exit_message "Not Available" exit_message "Not Available"
} }
grub_swap() {
if [ -d /sys/firmware/efi ]; then
grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg
else
grub2-mkconfig -o /boot/grub2/grub.cfg
fi
}
module_check() { module_check() {
echo -e "$blue""Finding our modules that are enabled""$nocolor" echo -e "$blue""Finding our modules that are enabled""$nocolor"
for module in "${enabled_modules[@]}"; do for module in "${enabled_modules[@]}"; do
@ -251,6 +260,9 @@ module_check
# Actually do the swap and distro-sync # Actually do the swap and distro-sync
package_swaps package_swaps
# Reconfigure grub
grub_swap
# Fix up modules # Fix up modules
module_fix module_fix