aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-06-05 16:01:28 +0200
committerGerd Hoffmann <kraxel@redhat.com>2019-06-05 16:01:28 +0200
commit4a90fb71a61051f81ba4fc7115d21c6873b5c081 (patch)
tree3c539820f546d5f006f2daf50a139e8f739acf6a
parent8da90a01cb7a2c3299fb4540d3b0d93a68e7127b (diff)
downloadimagefish-4a90fb71a61051f81ba4fc7115d21c6873b5c081.tar.gz
el update
-rwxr-xr-xRHEL7-efi.sh (renamed from RHEL75-efi.sh)5
-rwxr-xr-xRHEL76-efi.sh20
-rwxr-xr-xRHEL8-efi.sh (renamed from RHEL80-efi.sh)5
-rwxr-xr-xrun-all.sh6
4 files changed, 9 insertions, 27 deletions
diff --git a/RHEL75-efi.sh b/RHEL7-efi.sh
index 6ab4338..0d41b01 100755
--- a/RHEL75-efi.sh
+++ b/RHEL7-efi.sh
@@ -1,7 +1,8 @@
#!/bin/sh
-name="rhel-75-efi"
-repo="/mort/mirror/rhel/repo/el7/spunk-RHEL-7.5-Server.repo"
+vers="$1"
+name="rhel-${vers}-efi"
+repo="/mort/mirror/rhel/repo/el7/spunk-RHEL-${vers}-Server.repo"
rpms="grub2-efi shim efibootmgr -dracut-config-rescue dracut-config-generic"
arch="$(uname -m)"
diff --git a/RHEL76-efi.sh b/RHEL76-efi.sh
deleted file mode 100755
index 423d4eb..0000000
--- a/RHEL76-efi.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-name="rhel-76-efi"
-repo="/mort/mirror/rhel/repo/el7/spunk-RHEL-7.6-Server.repo"
-rpms="grub2-efi shim efibootmgr -dracut-config-rescue dracut-config-generic"
-
-arch="$(uname -m)"
-tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
-img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.qcow2"
-
-echo ""
-echo "###"
-echo "### $name"
-echo "###"
-
-set -ex
-rm -f "$tar" "$img"
-scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --yum
-scripts/tar-to-image.sh --tar "$tar" --image "$img" --efi-grub2
-virt-copy-in -a "$img" "$repo" /etc/yum.repos.d
diff --git a/RHEL80-efi.sh b/RHEL8-efi.sh
index 380a3d7..45daec7 100755
--- a/RHEL80-efi.sh
+++ b/RHEL8-efi.sh
@@ -1,7 +1,8 @@
#!/bin/sh
-name="rhel-80-beta-efi"
-repo="/mort/mirror/rhel/repo/el8/spunk-RHEL-8.0-BaseOS.repo"
+vers="$1"
+name="rhel-${vers}-efi"
+repo="/mort/mirror/rhel/repo/el8/spunk-RHEL-${vers}-BaseOS.repo"
rpms="grub2-efi grub2-pc shim efibootmgr -grubby -dracut-config-rescue dracut-config-generic"
arch="$(uname -m)"
diff --git a/run-all.sh b/run-all.sh
index c27f725..ad7c3b6 100755
--- a/run-all.sh
+++ b/run-all.sh
@@ -25,9 +25,9 @@ sirius)
linux32 ./Fedora-efi-grub2.sh $FVER || exit 1
linux32 ./Fedora-efi-systemd.sh $FVER || exit 1
- ./RHEL75-efi.sh || exit 1
- ./RHEL76-efi.sh || exit 1
- ./RHEL80-efi.sh || exit 1
+ ./RHEL7-efi.sh 7.5 || exit 1
+ ./RHEL7-efi.sh 7.6 || exit 1
+ ./RHEL8-efi.sh 8.0 || exit 1
./CentOS7-efi.sh || exit 1
;;
*)