Use 'x64' and 'x32' architecture names on EFI part

diff --git a/efi-boot-update b/efi-boot-update
index 87fba1e70288a2551bac4fd0cbd59449b7b2df4c..41a8abe7f2b5832618eece988508e7c2c234a7fb 100755 (executable)
--- a/efi-boot-update
+++ b/efi-boot-update
@@ -217,7 +217,6 @@ else
     EFIBOOTMGR=/bin/true
 fi
 
-
 for bootloader_conf in /etc/efi-boot/update.d/*.conf ; do
     if [ ! -e "$bootloader_conf" ] ; then
         continue
@@ -239,7 +238,17 @@ for bootloader_conf in /etc/efi-boot/update.d/*.conf ; do
         continue
     fi
 
-    DESTDIR="/boot/efi/EFI/$(echo -n "$PLATFORM_DIR"|sed -e's/@ARCH@/'"$ARCH"'/')"
+    local efi_arch
+    if [[ "$ARCH" = i?86 || "$ARCH" = pentium[45] || "$ARCH" = "athlon" ]] ; then
+        # %ix86
+        efi_arch=x32
+    elif [[ "$ARCH" = "x86_64" || "$ARCH" = "amd64" || "$ARCH" = "ia32e" ]] ; then
+        # %x8664
+        efi_arch=x64
+    else
+        efi_arch="$ARCH"
+    fi
+    DESTDIR="/boot/efi/EFI/$(echo -n "$PLATFORM_DIR"|sed -e's/@ARCH@/'"$efi_arch"'/')"
     mkdir -p "$DESTDIR"
 
     verbose "Updating $LABEL..."