===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.80
retrieving revision 1.82
diff -u -r1.80 -r1.82
--- openbsd/update_openbsd/update_openbsd	2015/11/27 22:38:38	1.80
+++ openbsd/update_openbsd/update_openbsd	2016/05/10 02:58:12	1.82
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.79 2015/11/03 03:56:53 andrew Exp $
+# $AFresh1: update_openbsd,v 1.81 2015/11/27 22:39:14 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -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
+    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"