===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.120
retrieving revision 1.125
diff -u -r1.120 -r1.125
--- openbsd/update_openbsd/update_openbsd	2019/03/02 00:34:34	1.120
+++ openbsd/update_openbsd/update_openbsd	2019/04/23 23:38:48	1.125
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.119 2018/12/16 23:42:07 andrew Exp $
+# $AFresh1: update_openbsd,v 1.124 2019/03/31 21:10:01 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -546,9 +546,6 @@
         done
         cd $OLDPWD
     fi
-
-    echo "===> Updating /var/db/kernel.SHA256"
-    sha256 -h /var/db/kernel.SHA256 ${_d}/bsd
 }
 
 install_sets() {
@@ -652,6 +649,9 @@
     . ${HOME}/.update_openbsdrc
 fi
 
+if [ -z "$MIRROR" -a -e /etc/installurl ]; then
+	MIRROR=$(head -1 /etc/installurl)
+fi
 MIRROR=${MIRROR:=http://cdn.openbsd.org/pub/OpenBSD}
 FTP_CMD=${FTP_CMD:=ftp -V}
 
@@ -756,11 +756,6 @@
     fi
 fi
 
-if [ $( ls -1 /usr/share/relink/ 2>/dev/null | wc -l ) -gt 0 ]; then
-    echo "==> REMOVING /usr/share/relink/*"
-    rm -rf /usr/share/relink/*
-fi
-
 install_kernels
 install_sets
 
@@ -771,6 +766,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 )
@@ -778,6 +778,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