rename efi to efi-grub2

3 files changed, 10 insertions, 10 deletions

diff --git a/F25-efi.sh b/F25-efi-grub2.sh
index 89e41a2..9d7caf0 100755
--- a/F25-efi.sh
+++ b/F25-efi-grub2.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-name="fedora-25-efi"
+name="fedora-25-efi-grub2"
 repo="repos/fedora-25.repo"
 rpms="grub2-efi shim"
 
@@ -16,4 +16,4 @@ echo "###"
 set -ex
 rm -f "$tar" "$img"
 scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --dnf
-scripts/tar-to-image.sh --tar "$tar" --image "$img" --efi
+scripts/tar-to-image.sh --tar "$tar" --image "$img" --efi-grub2
diff --git a/RHEL73-efi.sh b/RHEL73-efi.sh
index a21fea2..cc04fe8 100755
--- a/RHEL73-efi.sh
+++ b/RHEL73-efi.sh
@@ -16,4 +16,4 @@ 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
+scripts/tar-to-image.sh --tar "$tar" --image "$img" --efi-grub2
diff --git a/scripts/tar-to-image.sh b/scripts/tar-to-image.sh
index 1cd03e0..6f90df4 100755
--- a/scripts/tar-to-image.sh
+++ b/scripts/tar-to-image.sh
@@ -6,7 +6,7 @@
 qcow=""
 size="4G"
 tarb=""
-mode="efi"
+mode="efi-grub2"
 
 ######################################################################
 # create work dir
@@ -50,7 +50,7 @@ options:
     --image <image>
     --size <size>                 (default: $size)
   mode:
-    --efi                         (default)
+    --efi-grub2                   (default)
     --rpi32
     --rpi64
 EOF
@@ -70,8 +70,8 @@ while test "$1" != ""; do
 		tarb="$2"
 		shift; shift
 		;;
-	--efi)
-		mode="efi"
+	--efi-grub2)
+		mode="efi-grub2"
 		shift
 		;;
 	--rpi32)
@@ -164,7 +164,7 @@ function fish_copy_tar() {
 	fish write /.autorelabel ""
 }
 
-function fish_part_efi() {
+function fish_part_efi_grub2() {
 	local uuid_efi="C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
 	local id_uefi id_boot id_swap id_root
 
@@ -369,9 +369,9 @@ if test "$GUESTFISH_PID" = ""; then
 fi
 
 case "$mode" in
-efi)
+efi-grub2)
 	fish_init
-	fish_part_efi
+	fish_part_efi_grub2
 	fish_copy_tar
 	fish_grub2_efi
 	fish_fini