===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.79
retrieving revision 1.83
diff -u -r1.79 -r1.83
--- openbsd/update_openbsd/update_openbsd	2015/11/03 03:56:53	1.79
+++ openbsd/update_openbsd/update_openbsd	2016/10/01 21:12:17	1.83
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.78 2015/10/11 23:35:14 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
@@ -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"