switch el8 to dnf

3 files changed, 16 insertions, 5 deletions

diff --git a/CentOS8-efi.sh b/CentOS8-efi.sh
index f4bf40f..d19a174 100755
--- a/CentOS8-efi.sh
+++ b/CentOS8-efi.sh
@@ -4,8 +4,8 @@ name="centos-8-efi"
 repo="repos/centos-8.repo"
 rpms="shim -grubby -dracut-config-rescue dracut-config-generic"
 
-rpms_x86_64="shim grub2-efi grub2-pc"
-rpms_aarch64="shim grub2-efi"
+rpms_x86_64="shim grub2-efi-x64 grub2-pc"
+rpms_aarch64="shim grub2-efi-aa64"
 eval "rpms=\"\$rpms \$rpms_$(sh basearch.sh)\""
 
 arch="$(uname -m)"
@@ -21,5 +21,6 @@ echo "###"
 
 set -ex
 rm -f "$tar" "$img"
-scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --yum
+scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" \
+	--platform el8 --dnf
 scripts/tar-to-image.sh --tar "$tar" --image "$img" --efi-grub2
diff --git a/RHEL8-efi.sh b/RHEL8-efi.sh
index 2ab628c..9e32b5d 100755
--- a/RHEL8-efi.sh
+++ b/RHEL8-efi.sh
@@ -3,7 +3,7 @@
 vers="$1"
 name="rhel-${vers}-efi"
 repo="/mort/mirror/rhel/repo/el8/mirror-RHEL-${vers}-BaseOS.repo"
-rpms="grub2-efi grub2-pc shim -grubby -dracut-config-rescue dracut-config-generic"
+rpms="grub2-efi-x64 grub2-pc shim -grubby -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
 tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
@@ -18,6 +18,7 @@ echo "###"
 
 set -ex
 rm -f "$tar" "$img"
-scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --yum
+scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" \
+	--platform el8 --dnf
 scripts/tar-to-image.sh --tar "$tar" --image "$img" --efi-grub2
 virt-copy-in -a "$img" "$repo" /etc/yum.repos.d
diff --git a/scripts/install-redhat.sh b/scripts/install-redhat.sh
index 7878578..4b31617 100755
--- a/scripts/install-redhat.sh
+++ b/scripts/install-redhat.sh
@@ -11,6 +11,7 @@ rpms=""
 krnl="kernel"
 conf=""
 quiet="--quiet"
+platform=""
 
 ######################################################################
 # create work dir
@@ -50,6 +51,7 @@ options:
     --kernel <kernel>               (default: $krnl)
   package manager setup
     --config <repos>
+    --platform <name>
     --dnf                           (default)
     --yum
 EOF
@@ -82,6 +84,10 @@ while test "$1" != ""; do
 		conf="$2"
 		shift; shift
 		;;
+	--platform)
+		platform="$2"
+		shift; shift
+		;;
 	-v | --verbose)
 		quiet=""
 		shift
@@ -149,6 +155,9 @@ dnf)
 		tool="$tool --setopt=zchunk=off"
 		tool="$tool --releasever=0"
 	fi
+	if test "$platform" != ""; then
+		tool="$tool --setopt=module_platform_id=platform:$platform"
+	fi
 	inst=""
 	for item in $grps; do inst="${inst} @${item}"; done
 	for item in $rpms; do