===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.96
retrieving revision 1.105
diff -u -r1.96 -r1.105
--- openbsd/update_openbsd/update_openbsd	2017/12/10 21:20:53	1.96
+++ openbsd/update_openbsd/update_openbsd	2017/12/11 02:58:57	1.105
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.95 2017/12/10 21:19:11 andrew Exp $
+# $AFresh1: update_openbsd,v 1.103 2017/12/11 02:50:09 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
@@ -79,6 +83,63 @@
         echo $_v
 }
 
+set_boot_device() {
+	BOOT_DEVICE=$( df -nP /bsd | sed -ne 's! .*/$!!p' )
+
+	root_disk=$( echo $BOOT_DEVICE |
+	    sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' )
+	msdos_partition=$(
+	    fdisk $root_disk | grep -q '^*.*FAT32' \
+	    && \
+	    disklabel $root_disk | sed -ne 's/:.*MSDOS//p' | tr -d ' '
+	)
+
+	[ "$msdos_partition" ] &&
+	    BOOT_DEVICE="/dev/$root_disk$msdos_partition"
+}
+
+boot_device_mounted=""
+mount_boot_device() {
+    [ "$boot_device_mounted" ] && 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
+}
+
+umount_boot_device() {
+    [ "$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"`
@@ -175,21 +236,22 @@
         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 )
+    kernel_is_multiprocessor $BOOT_KERNEL && BOOT_KERNEL=bsd.mp
+    cd $OLDPWD
+    umount_boot_device
 
     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"
@@ -307,18 +369,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
@@ -355,16 +419,46 @@
 
 
 install_kernels() {
-    echo '==> INSTALLING KERNEL'
+    local _d=$1
+    local default_mount
+    local boot_mount
+    local mount_is_msdos
 
+    if [ ! "$_d" ]; then
+        default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' )
+        mount_boot_device
+
+	if [ "$KERNEL_ROOT" != "$default_mount" ]; then
+		local _ik="$INSTALL_KERNELS"
+		INSTALL_KERNELS="$BOOT_KERNEL bsd.rd"
+
+		install_kernels $KERNEL_ROOT
+
+		INSTALL_KERNELS="$_ik"
+	fi
+
+        umount_boot_device
+
+        install_kernels $default_mount
+        return
+    fi
+
+    echo "==> INSTALLING KERNEL to $_d"
+
     if [ X"" == X"$RELEASEDIR" ]; then
         echo ERROR: no source for new kernels! >&2
         exit 1
     fi
 
+    [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1
+
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
-        echo "===> Backing up $BOOT_KERNEL to /obsd"
-        ln -f $BOOT_KERNEL /obsd
+        echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"
+        if [ $mount_is_msdos ]; then
+            cp $BOOT_KERNEL ${_d}obsd
+        else
+            ln -f $BOOT_KERNEL ${_d}obsd
+        fi
         if [ $? -ne 0 ]; then
             echo "Error copying old kernel!" >&2
             exit 1
@@ -374,15 +468,15 @@
     cd $RELEASEDIR
 
     for _b in $INSTALL_KERNELS; do
-        rm -f /nbsd
+        rm -f ${_d}nbsd
         local _bd=$_b
         [ X"${_b}" == X"bsd" ] && _bd="bsd.sp"
 
         local _is_boot=""
-        [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"
+        [ X"$BOOT_KERNEL" == X"${_d}${_bd}" ] && _is_boot="# boot kernel"
 
-        echo "Copying $_b to /$_bd $_is_boot"
-        cp ${_b} /nbsd && mv /nbsd /${_bd}
+        echo "Copying $_b to ${_d}$_bd $_is_boot"
+        cp ${_b} ${_d}nbsd && mv ${_d}nbsd ${_d}${_bd}
         if [ $? -ne 0 ]; then
             echo ERROR: Could not copy new $_bd kernel! >&2
             exit 1
@@ -391,21 +485,22 @@
 
     cd $OLDPWD
 
-    if [ ! -h /bsd ]; then
-	    cd /
+    if [ ! -h ${_d}bsd ]; then
+        cd ${_d}
         for _b in $BOOT_KERNELS; do
             [ X"$_b" == X"bsd" ] && _b="bsd.sp"
             if [ -e $_b ]; then
-                echo "===> symlinking $_b to /bsd"
-                ln -sf $_b bsd
-                if [ $? -ne 0 ]; then
-                    echo ERROR: Could not symlink new kernel! >&2
-                    exit 1
+                if [ "$mount_is_msdos" ]; then
+                    echo "===> Moving $_b ${_d}bsd (MSDOS)"
+                    mv -f ${_b} bsd
+                else
+                    echo "===> symlinking $_b to ${_d}bsd"
+                    ln -sf $_b bsd
                 fi
                 break
             fi
         done
-	    cd $OLDPWD
+        cd $OLDPWD
     fi
 }
 
@@ -544,6 +639,7 @@
 echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"
 echo "      RELEASEDIR: $RELEASEDIR"
 echo "         DESTDIR: $DESTDIR"
+echo "     BOOT_DEVICE: $BOOT_DEVICE"
 echo "     BOOT_KERNEL: $BOOT_KERNEL"
 echo " INSTALL_KERNELS: $INSTALL_KERNELS"
 echo "  INSTALLED_SETS: $INSTALLED_SETS"
@@ -553,12 +649,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}