===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.99
retrieving revision 1.110
diff -u -r1.99 -r1.110
--- openbsd/update_openbsd/update_openbsd	2017/12/11 01:45:45	1.99
+++ openbsd/update_openbsd/update_openbsd	2018/10/01 00:31:27	1.110
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.98 2017/12/11 01:35:44 andrew Exp $
+# $AFresh1: update_openbsd,v 1.109 2018/02/08 19:08:01 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -52,6 +52,10 @@
     #what $1 | sed -ne 's/[[:blank:]]\{1,\}//p'
 }
 
+kernel_is_multiprocessor() {
+    printf "find cpu*\nexit\n" | config -e $1 2>/dev/null | grep -q "cpu\* at "
+}
+
 version_in() {
         local _proto=${FTP%%://*}
         local _file
@@ -96,31 +100,47 @@
 
 boot_device_mounted=""
 mount_boot_device() {
-    if [ "boot_device_mounted" ]; then
-        echo $boot_device_mounted
-        return
-    fi
+    [ "$boot_device_mounted" ] && return
+    [ "$BOOT_DEVICE" ] || return
 
     local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )
     local boot_mount=$( mount |
 	    sed -ne "s!^$BOOT_DEVICE on \([^ ]*\).*!\1!p" )
 
     if [ ! "$boot_mount" ]; then
-            mount $BOOT_DEVICE /mnt
-            boot_device_mounted=/mnt
-            echo /mnt
+        mount $BOOT_DEVICE /mnt
+        boot_device_mounted=1
+        KERNEL_ROOT=/mnt
     elif [ "$boot_mount" != "$default_mount" ]; then
-        echo $boot_mount/
+        KERNEL_ROOT=$boot_mount/
     else
-        echo ${default_mount%/}/
+        KERNEL_ROOT=${default_mount%/}/
     fi
 }
 
 umount_boot_device() {
-    [ "$boot_device_mounted" ] && umount $boot_device_mounted
+    [ "$boot_device_mounted" ] && umount $BOOT_DEVICE
     boot_device_mounted=""
 }
 
+find_boot_kernel() {
+    local _k=$( ( \
+        echo bsd; \
+        [ -e boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \
+            s///; s/^.*://; s/ .*$//' boot.conf \
+    ) | tail -1 )
+    _k=$( follow_symlink $_k )
+
+    local _d=$( dirname $_k )
+    [ "$_d" = "." ] && _d=$PWD
+
+    if [ $_d = . -o $_d = $PWD ]; then
+        basename $_k
+    else
+        echo $_k
+    fi
+}
+
 set_version() {
     CUR_VER=`uname -r`
     NEW_VER=`dc -e "$CUR_VER 0.1 + p"`
@@ -217,34 +237,39 @@
         FTP=${MIRROR}/${_dir}/`machine`
     fi
 
-    BOOT_KERNEL=`( \
-        echo bsd; \
-        [ -e /boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \
-            s///; s/^.*://; s/ .*$//' /boot.conf \
-    ) | tail -1`
-    BOOT_KERNEL=`follow_symlink /$BOOT_KERNEL`
-    BOOT_KERNEL="/${BOOT_KERNEL#/}"
+    KERNEL_ROOT=""
+    [ -z "$BOOT_DEVICE" ] && set_boot_device
 
-    BOOT_KERNEL_VERSION=`kernel_file_version $BOOT_KERNEL`
+    mount_boot_device
+    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
+        BOOT_KERNEL=bsd.mp
+    fi
 
     BOOTED_KERNEL_VERSION=`sysctl -n kern.version`
     NEW_KERNEL_VERSION=""
 
     # We want to default to what we had
-    INSTALL_KERNELS="${BOOT_KERNEL#/}"
+    INSTALL_KERNELS="$BOOT_KERNEL"
     # if the boot kernel was our specially named bsd.sp, we install from bsd
     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"
 }
@@ -349,18 +374,20 @@
     local _missing_sets
     local _v=$FILE_VER
 
+    mount_boot_device
     for _n in $INSTALL_KERNELS; do
         local _o=$_n
-        [ X"bsd" == X"${_o}" -a -e /bsd.sp ] && _o=bsd.sp
-        if [ -e /${_o} -a ! -e ./${_n} ]; then
-            echo ${_o} does not exist
+        [ X"bsd" == X"${_o}" -a -e ${KERNEL_ROOT}bsd.sp ] && _o=bsd.sp
+        if [ -e ${KERNEL_ROOT}${_o} -a ! -e ./${_n} ]; then
+            echo ${_o} does not exist on $BOOT_DEVICE
             _missing_sets=1
         fi
 
-        if [ X"${BOOT_KERNEL}" == X"/${_o}" -a -e ./${_n} ]; then
+        if [ X"${BOOT_KERNEL}" == X"${_o}" -a -e ./${_n} ]; then
             NEW_KERNEL_VERSION=`kernel_file_version ./${_n}`
         fi
     done
+    umount_boot_device
 
     if [ X"$NEW_KERNEL_VERSION" == X"" ]; then
         echo Missing replacement for boot kernel $BOOT_KERNEL >&2
@@ -397,20 +424,22 @@
 
 
 install_kernels() {
-    local _d=$1
+    local _d="$1"
     local default_mount
     local boot_mount
     local mount_is_msdos
 
-    if [ ! "$_d" ]; then
+    if [ "$_d" ]; then
+      _d=$( readlink -nf "$_d" )
+    else
         default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )
-        boot_mount=$( mount_boot_device )
+        mount_boot_device
 
-	if [ "$boot_mount" != "$default_mount" ]; then
+	if [ "$KERNEL_ROOT" != "$default_mount" ]; then
 		local _ik="$INSTALL_KERNELS"
-		INSTALL_KERNELS="${BOOT_KERNEL#/} bsd.rd"
+		INSTALL_KERNELS="$BOOT_KERNEL bsd.rd"
 
-		install_kernels $boot_mount/
+		install_kernels $KERNEL_ROOT
 
 		INSTALL_KERNELS="$_ik"
 	fi
@@ -428,14 +457,15 @@
         exit 1
     fi
 
-    mount | grep -q " ${_d%/} .* msdos" && mount_is_msdos=1
+    [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1
+    [ $_d != / ] && $_d=$_d/
 
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
         echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"
         if [ $mount_is_msdos ]; then
-            cp $BOOT_KERNEL ${_d}obsd
+            cp ${_d}$BOOT_KERNEL ${_d}obsd
         else
-            ln -f $BOOT_KERNEL ${_d}obsd
+            ln -f ${_d}$BOOT_KERNEL ${_d}obsd
         fi
         if [ $? -ne 0 ]; then
             echo "Error copying old kernel!" >&2
@@ -583,7 +613,7 @@
     . ${HOME}/.update_openbsdrc
 fi
 
-MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD}
+MIRROR=${MIRROR:=http://cdn.openbsd.org/pub/OpenBSD}
 FTP_CMD=${FTP_CMD:=ftp -V}
 
 DESTDIR=${DESTDIR:=/}
@@ -593,7 +623,6 @@
 export PKG_PATH TRUSTED_PKG_PATH
 
 set_version
-[ -z "$BOOT_DEVICE" ] && set_boot_device
 
 TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all}
 if [ "$FORCE_DIR" = "No" ]; then
@@ -628,12 +657,14 @@
 #echo "        FILE_VER: $FILE_VER"
 echo
 
+mount_boot_device
 for k in $INSTALL_KERNELS; do
-    if [ -e "/$k" ]; then
-        echo "Existing $k"
-        kernel_file_version "/$k"
+    if [ -e $KERNEL_ROOT$k ]; then
+        echo "Existing $BOOT_DEVICE:$k"
+        kernel_file_version $KERNEL_ROOT$k
     fi
 done
+umount_boot_device
 
 if [ ${_error} -ne 0 ]; then
 	exit ${_error}