===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- openbsd/update_openbsd/update_openbsd	2017/12/11 02:50:09	1.103
+++ openbsd/update_openbsd/update_openbsd	2017/12/11 02:53:13	1.104
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.102 2017/12/11 02:36:03 andrew Exp $
+# $AFresh1: update_openbsd,v 1.103 2017/12/11 02:50:09 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -118,6 +118,24 @@
     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,21 +235,18 @@
     KERNEL_ROOT=""
     [ -z "$BOOT_DEVICE" ] && set_boot_device
 
-    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#/}"
+    mount_boot_device
+    cd $KERNEL_ROOT
+    BOOT_KERNEL=$( find_boot_kernel )
+    BOOT_KERNEL_VERSION=$( kernel_file_version $BOOT_KERNEL )
+    cd $OLDPWD
+    umount_boot_device
 
-    BOOT_KERNEL_VERSION=`kernel_file_version $BOOT_KERNEL`
-
     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"
@@ -349,18 +364,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
@@ -408,7 +425,7 @@
 
 	if [ "$KERNEL_ROOT" != "$default_mount" ]; then
 		local _ik="$INSTALL_KERNELS"
-		INSTALL_KERNELS="${BOOT_KERNEL#/} bsd.rd"
+		INSTALL_KERNELS="$BOOT_KERNEL bsd.rd"
 
 		install_kernels $KERNEL_ROOT
 
@@ -627,12 +644,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}