===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.110
retrieving revision 1.122
diff -u -r1.110 -r1.122
--- openbsd/update_openbsd/update_openbsd	2018/10/01 00:31:27	1.110
+++ openbsd/update_openbsd/update_openbsd	2019/03/02 01:04:52	1.122
@@ -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.121 2019/03/02 01:02:02 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
@@ -178,7 +172,7 @@
     if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then
         if [ X"No" != X"${FORCE_DIR}" ]; then
             _dir=${FORCE_DIR}
-        elif sysctl kern.version | grep -q -- '-current '; then
+        elif sysctl kern.version | grep -q -e '-current ' -e '-beta '; then
             _dir=snapshots
             FORCE_DIR=snapshots
         else
@@ -241,11 +235,29 @@
     [ -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 )
-    if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOT_KERNEL; then
+    BOOTED_KERNEL=$( find_boot_kernel )
+    BOOT_KERNEL_VERSION=$( kernel_file_version $BOOTED_KERNEL )
+
+    if [ $(sysctl -n hw.ncpufound) -gt 1 ] || kernel_is_multiprocessor $BOOTED_KERNEL; then
         BOOT_KERNEL=bsd.mp
+    else
+        BOOT_KERNEL=$BOOTED_KERNEL
     fi
 
     BOOTED_KERNEL_VERSION=`sysctl -n kern.version`
@@ -268,6 +280,14 @@
     done
 
     cd $OLDPWD
+
+    EFI_BOOT=""
+    if [ -d "/mnt/efi/boot" ]; then
+        _d=$( cd "/mnt/efi/boot" && ls -1 *.{efi,EFI} 2>/dev/null )
+        # assume an MSDOS filesystem and so case insensitive
+        [ "$_d" ] && EFI_BOOT=$( echo $_d | tr a-z A-Z )
+    fi
+
     umount_boot_device
 
     BOOT_KERNELS=$INSTALL_KERNELS
@@ -286,6 +306,16 @@
 
     local _v=$FILE_VER
 
+    if [ "$EFI_BOOT" ]; then
+        _b="$EFI_BOOT"
+        if [ ! -e ./${_b} ]; then
+            echo "===> $FTP_CMD ${FTP}/${_b}"
+            $FTP_CMD ${FTP}/${_b}
+        else
+            echo "===> Have ${_b}"
+        fi
+    fi
+
     for _b in $INSTALL_KERNELS; do
         if [ ! -e ./${_b} ]; then
             echo "===> $FTP_CMD ${FTP}/${_b}"
@@ -425,17 +455,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 +474,7 @@
 
         umount_boot_device
 
-        install_kernels $default_mount
+        install_kernels /
         return
     fi
 
@@ -457,15 +485,23 @@
         exit 1
     fi
 
+    [ $_d != / ] && _d=${_d%/}/
     [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1
-    [ $_d != / ] && $_d=$_d/
 
+    if [ "$EFI_BOOT" -a -d /mnt/efi/boot ]; then
+       echo "Copying $EFI_BOOT to /mnt/efi/boot/"
+       ( cd /mnt/efi/boot \
+         && cp "$RELEASEDIR/$EFI_BOOT" "n$EFI_BOOT" \
+         && mv "n$EFI_BOOT" "$EFI_BOOT"
+       )
+    fi
+
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
-        echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"
+        echo "===> Backing up ${_d}$BOOTED_KERNEL to ${_d}obsd"
         if [ $mount_is_msdos ]; then
-            cp ${_d}$BOOT_KERNEL ${_d}obsd
+            cp ${_d}$BOOTED_KERNEL ${_d}obsd
         else
-            ln -f ${_d}$BOOT_KERNEL ${_d}obsd
+            ln -f ${_d}$BOOTED_KERNEL ${_d}obsd
         fi
         if [ $? -ne 0 ]; then
             echo "Error copying old kernel!" >&2
@@ -648,6 +684,7 @@
 echo "      RELEASEDIR: $RELEASEDIR"
 echo "         DESTDIR: $DESTDIR"
 echo "     BOOT_DEVICE: $BOOT_DEVICE"
+[ "$EFI_BOOT" ] && echo "        EFI_BOOT: $EFI_BOOT"
 echo "     BOOT_KERNEL: $BOOT_KERNEL"
 echo " INSTALL_KERNELS: $INSTALL_KERNELS"
 echo "  INSTALLED_SETS: $INSTALLED_SETS"
@@ -658,9 +695,11 @@
 echo
 
 mount_boot_device
+l=$KERNEL_ROOT
+[ "$l" = / ] || l="$BOOT_DEVICE:"
 for k in $INSTALL_KERNELS; do
     if [ -e $KERNEL_ROOT$k ]; then
-        echo "Existing $BOOT_DEVICE:$k"
+        echo "Existing $l$k"
         kernel_file_version $KERNEL_ROOT$k
     fi
 done
@@ -679,7 +718,7 @@
 echo "===> Last booted:\n$BOOTED_KERNEL_VERSION"
 if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
   -a X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
-    echo "Next boot (unless replaced):\n$BOOT_KERNEL_VERSION"
+    echo "Next boot $BOOTED_KERNEL (unless replaced):\n$BOOT_KERNEL_VERSION"
 fi
 if [ -n "$NEW_KERNEL_VERSION" ]; then
     echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION";
@@ -724,6 +763,11 @@
         echo Removing /sbin/oreboot
         rm -f /sbin/oreboot
     fi
+
+    echo "===> Relinking to create unique kernel..."
+    sha256 -h /var/db/kernel.SHA256 /bsd
+    /usr/libexec/reorder_kernel
+
     update_etc
 
     OPENUP=$( which openup 2>/dev/null )
@@ -731,6 +775,10 @@
         echo "==> UPDATING WITH $OPENUP"
         $OPENUP
     else
+        if [ X"snapshots" != X"$FORCE_DIR" ]; then
+            echo '==> Running syspatch'
+            syspatch
+        fi
         echo '==> UPDATING PACKAGES'
         pkg_add -u
     fi