===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.114
retrieving revision 1.118
diff -u -r1.114 -r1.118
--- openbsd/update_openbsd/update_openbsd	2018/12/16 20:49:58	1.114
+++ openbsd/update_openbsd/update_openbsd	2018/12/16 21:10:00	1.118
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.113 2018/12/16 20:31:06 andrew Exp $
+# $AFresh1: update_openbsd,v 1.117 2018/12/16 20:57:49 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -251,10 +251,13 @@
     fi
 
     cd $KERNEL_ROOT
-    BOOT_KERNEL=$( find_boot_kernel )
-    BOOT_KERNEL_VERSION=$( kernel_file_version $BOOT_KERNEL )
-    if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOT_KERNEL; then
+    BOOTED_KERNEL=$( find_boot_kernel )
+    BOOT_KERNEL_VERSION=$( kernel_file_version $BOOTED_KERNEL )
+
+    if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOTED_KERNEL; then
         BOOT_KERNEL=bsd.mp
+    else
+        BOOT_KERNEL=$BOOTED_KERNEL
     fi
 
     BOOTED_KERNEL_VERSION=`sysctl -n kern.version`
@@ -486,16 +489,19 @@
     [ $_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/"
+       echo "Copying $EFI_BOOT to /mnt/efi/boot/"
+       ( cd /mnt/efi/boot \
+         && cp "$RELEASEDIR/$EFI_BOOT" "n$EFI_BOOT" \
+         && mv "n$EFI_BOOT" "$EFI_BOOT"
+       )
     fi
 
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
-        echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"
+        echo "===> Backing up ${_d}$BOOTED_KERNEL to ${_d}obsd"
         if [ $mount_is_msdos ]; then
-            cp ${_d}$BOOT_KERNEL ${_d}obsd
+            cp ${_d}$BOOTED_KERNEL ${_d}obsd
         else
-            ln -f ${_d}$BOOT_KERNEL ${_d}obsd
+            ln -f ${_d}$BOOTED_KERNEL ${_d}obsd
         fi
         if [ $? -ne 0 ]; then
             echo "Error copying old kernel!" >&2
@@ -712,7 +718,7 @@
 echo "===> Last booted:\n$BOOTED_KERNEL_VERSION"
 if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
   -a X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
-    echo "Next boot (unless replaced):\n$BOOT_KERNEL_VERSION"
+    echo "Next boot $BOOTED_KERNEL (unless replaced):\n$BOOT_KERNEL_VERSION"
 fi
 if [ -n "$NEW_KERNEL_VERSION" ]; then
     echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION";