===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.77
retrieving revision 1.83
diff -u -r1.77 -r1.83
--- openbsd/update_openbsd/update_openbsd	2015/05/03 01:11:52	1.77
+++ openbsd/update_openbsd/update_openbsd	2016/10/01 21:12:17	1.83
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.76 2015/05/02 23:27:53 andrew Exp $
+# $AFresh1: update_openbsd,v 1.82 2016/05/10 01:58:12 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -471,7 +471,7 @@
     local _v=$FILE_VER
     local _args=""
 
-    if [ ! -e /usr/share/sysmerge/etc.tgz ]; then
+    if [ ! -e /var/sysmerge/etc.tgz ]; then
         if [ X"" == X"$RELEASEDIR" ]; then
             echo "ERROR: no source for etc!" >&2
             exit 1
@@ -515,12 +515,12 @@
 FTP_CMD=${FTP_CMD:=ftp -V}
 PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
 
-set_version
-
 DESTDIR=${DESTDIR:=/}
 SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
 FORCE_DIR=${FORCE_DIR:=No}
 
+set_version
+
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
 CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
@@ -583,7 +583,7 @@
     echo "!!!  at the end of the proces but it is safer to  !!!" >&2 
     echo "!!!  have a separate root shell open.             !!!" >&2
     echo "!!!  It is needed in order to run /sbin/oreboot.  !!!" >&2
-    echo "!!!  sudo MAY NOT WORK after sets are extracted.  !!!" >&2
+    echo "!!!  doas MAY NOT WORK after sets are extracted.  !!!" >&2
     echo >&2
     echo "enter to continue, ctrl+C to cancel" >&2
     local _temp
@@ -611,7 +611,7 @@
     fi
     update_etc
 
-    OPENUP=$( which openup )
+    OPENUP=$( which openup 2>/dev/null )
     if [ -n "$OPENUP" ]; then
         echo "==> UPDATING WITH $OPENUP"
         $OPENUP
@@ -624,6 +624,10 @@
     fw_update
 
 else
+    [ -e /etc/rc.sysmerge ] && grep -q $SYSMERGE /etc/rc.sysmerge ||
+        echo "$SYSMERGE -b" >>/etc/rc.sysmerge &&
+        echo "==> RUNNING $SYSMERGE -b ON REBOOT"
+
     echo Instructions for updating to the new version available from 
     if [ X"snapshots" == X"$FORCE_DIR" ]; then
         echo "  http://www.openbsd.org/faq/current.html"