===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.112
retrieving revision 1.121
diff -u -r1.112 -r1.121
--- openbsd/update_openbsd/update_openbsd	2018/12/16 20:23:38	1.112
+++ openbsd/update_openbsd/update_openbsd	2019/03/02 01:02:02	1.121
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.111 2018/12/16 20:12:16 andrew Exp $
+# $AFresh1: update_openbsd,v 1.120 2019/03/02 00:34:34 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -172,7 +172,7 @@
     if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then
         if [ X"No" != X"${FORCE_DIR}" ]; then
             _dir=${FORCE_DIR}
-        elif sysctl kern.version | grep -q -- '-current '; then
+        elif sysctl kern.version | grep -q -e '-current ' -e '-beta '; then
             _dir=snapshots
             FORCE_DIR=snapshots
         else
@@ -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`
@@ -277,6 +280,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 +306,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,12 +488,20 @@
     [ $_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/"
+       ( 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
@@ -655,6 +684,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"
@@ -665,9 +695,11 @@
 echo
 
 mount_boot_device
+l=$KERNEL_ROOT
+[ "$l" = / ] || l="$BOOT_DEVICE:"
 for k in $INSTALL_KERNELS; do
     if [ -e $KERNEL_ROOT$k ]; then
-        echo "Existing $BOOT_DEVICE:$k"
+        echo "Existing $l$k"
         kernel_file_version $KERNEL_ROOT$k
     fi
 done
@@ -686,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";
@@ -731,6 +763,11 @@
         echo Removing /sbin/oreboot
         rm -f /sbin/oreboot
     fi
+
+    echo "===> Relinking to create unique kernel..."
+    sha256 -h /var/db/kernel.SHA256 /bsd
+    /usr/libexec/reorder_kernel
+
     update_etc
 
     OPENUP=$( which openup 2>/dev/null )