===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- openbsd/update_openbsd/update_openbsd	2018/10/01 00:31:27	1.110
+++ openbsd/update_openbsd/update_openbsd	2018/12/16 20:12:16	1.111
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.109 2018/02/08 19:08:01 andrew Exp $
+# $AFresh1: update_openbsd,v 1.110 2018/09/30 23:31:27 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -84,7 +84,7 @@
 }
 
 set_boot_device() {
-	BOOT_DEVICE=$( df -nP /bsd | sed -ne 's! .*/$!!p' )
+	BOOT_DEVICE=$( df -lnP /bsd | sed -ne 's! .*/$!!p' )
 
 	root_disk=$( echo $BOOT_DEVICE |
 	    sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' )
@@ -103,18 +103,12 @@
     [ "$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=1
-        KERNEL_ROOT=/mnt
-    elif [ "$boot_mount" != "$default_mount" ]; then
-        KERNEL_ROOT=$boot_mount/
-    else
-        KERNEL_ROOT=${default_mount%/}/
     fi
 }
 
@@ -149,7 +143,7 @@
 
     local _cv=`echo $CUR_VER | sed -e 's/\.//'`
     local _nv=`echo $NEW_VER | sed -e 's/\.//'`
-    local _v
+    local _v _d _pkr
 
     if [ X"No" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then
         _dir=$FORCE_DIR
@@ -241,6 +235,21 @@
     [ -z "$BOOT_DEVICE" ] && set_boot_device
 
     mount_boot_device
+
+    # _pkr == possible_kernel_roots
+    _pkr=/
+    [ "$BOOT_DEVICE" ] && _pkr="/mnt/ $_pkr"
+
+    for _d in $_pkr; do
+	KERNEL_ROOT=$( df -lnP ${_d}bsd 2>/dev/null | sed -ne 's!/dev/.* !!p' )
+	[ "$KERNEL_ROOT" ] && break
+    done
+
+    if ![ "$KERNEL_ROOT" ]; then
+        echo "Unable to find KERNEL_ROOT, tried $_pkr" >&2
+        exit 2
+    fi
+
     cd $KERNEL_ROOT
     BOOT_KERNEL=$( find_boot_kernel )
     BOOT_KERNEL_VERSION=$( kernel_file_version $BOOT_KERNEL )
@@ -425,17 +434,15 @@
 
 install_kernels() {
     local _d="$1"
-    local default_mount
     local boot_mount
     local mount_is_msdos
 
     if [ "$_d" ]; then
       _d=$( readlink -nf "$_d" )
     else
-        default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )
         mount_boot_device
 
-	if [ "$KERNEL_ROOT" != "$default_mount" ]; then
+	if [ "$KERNEL_ROOT" != "/" ]; then
 		local _ik="$INSTALL_KERNELS"
 		INSTALL_KERNELS="$BOOT_KERNEL bsd.rd"
 
@@ -446,7 +453,7 @@
 
         umount_boot_device
 
-        install_kernels $default_mount
+        install_kernels /
         return
     fi
 
@@ -457,8 +464,8 @@
         exit 1
     fi
 
+    [ $_d != / ] && _d=${_d%/}/
     [ $_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"