===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- openbsd/update_openbsd/update_openbsd	2018/12/16 20:31:06	1.113
+++ openbsd/update_openbsd/update_openbsd	2018/12/16 20:49:58	1.114
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.112 2018/12/16 20:23:38 andrew Exp $
+# $AFresh1: update_openbsd,v 1.113 2018/12/16 20:31:06 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -277,6 +277,14 @@
     done
 
     cd $OLDPWD
+
+    EFI_BOOT=""
+    if [ -d "/mnt/efi/boot" ]; then
+        _d=$( cd "/mnt/efi/boot" && ls -1 *.{efi,EFI} 2>/dev/null )
+        # assume an MSDOS filesystem and so case insensitive
+        [ "$_d" ] && EFI_BOOT=$( echo $_d | tr a-z A-Z )
+    fi
+
     umount_boot_device
 
     BOOT_KERNELS=$INSTALL_KERNELS
@@ -295,6 +303,16 @@
 
     local _v=$FILE_VER
 
+    if [ "$EFI_BOOT" ]; then
+        _b="$EFI_BOOT"
+        if [ ! -e ./${_b} ]; then
+            echo "===> $FTP_CMD ${FTP}/${_b}"
+            $FTP_CMD ${FTP}/${_b}
+        else
+            echo "===> Have ${_b}"
+        fi
+    fi
+
     for _b in $INSTALL_KERNELS; do
         if [ ! -e ./${_b} ]; then
             echo "===> $FTP_CMD ${FTP}/${_b}"
@@ -467,6 +485,11 @@
     [ $_d != / ] && _d=${_d%/}/
     [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1
 
+    if [ "$EFI_BOOT" -a -d /mnt/efi/boot ]; then
+       echo "Copying $EFI_BOOT to /mnt/efi/boot/$EFI_BOOT"
+       cp "$EFI_BOOT" "/mnt/efi/boot/"
+    fi
+
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
         echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"
         if [ $mount_is_msdos ]; then
@@ -655,6 +678,7 @@
 echo "      RELEASEDIR: $RELEASEDIR"
 echo "         DESTDIR: $DESTDIR"
 echo "     BOOT_DEVICE: $BOOT_DEVICE"
+[ "$EFI_BOOT" ] && echo "        EFI_BOOT: $EFI_BOOT"
 echo "     BOOT_KERNEL: $BOOT_KERNEL"
 echo " INSTALL_KERNELS: $INSTALL_KERNELS"
 echo "  INSTALLED_SETS: $INSTALLED_SETS"