===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- openbsd/update_openbsd/update_openbsd	2017/12/11 02:58:57	1.105
+++ openbsd/update_openbsd/update_openbsd	2017/12/11 03:12:34	1.106
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.103 2017/12/11 02:50:09 andrew Exp $
+# $AFresh1: update_openbsd,v 1.105 2017/12/11 02:58:57 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -243,9 +243,9 @@
     cd $KERNEL_ROOT
     BOOT_KERNEL=$( find_boot_kernel )
     BOOT_KERNEL_VERSION=$( kernel_file_version $BOOT_KERNEL )
-    kernel_is_multiprocessor $BOOT_KERNEL && BOOT_KERNEL=bsd.mp
-    cd $OLDPWD
-    umount_boot_device
+    if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOT_KERNEL; then
+        BOOT_KERNEL=bsd.mp
+    fi
 
     BOOTED_KERNEL_VERSION=`sysctl -n kern.version`
     NEW_KERNEL_VERSION=""
@@ -256,15 +256,19 @@
     if [ X"$INSTALL_KERNELS" == X"bsd.sp" ]; then
         INSTALL_KERNELS="bsd"
     fi
-    # with a second option of an mp kernel if is is a likely candidate
-    if [ X"$INSTALL_KERNELS" != X"bsd.mp" ]; then
-        local _ncpu=$(sysctl -n hw.ncpufound)
-        [ $_ncpu -gt 1 ] && INSTALL_KERNELS="$INSTALL_KERNELS bsd.mp"
-    fi
-    # or just bsd otherwise
-    if [ X"${INSTALL_KERNELS% *}" != X"bsd" ]; then
-        INSTALL_KERNELS="$INSTALL_KERNELS bsd"
-    fi
+
+    # We want to update all kernels that exist
+    # either in the $KERNEL_ROOT or in /
+    for b in bsd bsd.mp; do
+        [ -e $b -o -e /$b ] || continue
+        if [ X"${INSTALL_KERNELS% *}" != X"$b" ]; then
+            INSTALL_KERNELS="$INSTALL_KERNELS $b"
+        fi
+    done
+
+    cd $OLDPWD
+    umount_boot_device
+
     BOOT_KERNELS=$INSTALL_KERNELS
     INSTALL_KERNELS="$INSTALL_KERNELS bsd.rd"
 }