===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.67
retrieving revision 1.69
diff -u -r1.67 -r1.69
--- openbsd/update_openbsd/update_openbsd	2014/05/11 03:40:54	1.67
+++ openbsd/update_openbsd/update_openbsd	2014/10/19 00:05:49	1.69
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.66 2014/02/01 22:07:04 andrew Exp $
+# $AFresh1: update_openbsd,v 1.68 2014/10/18 22:42:35 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -462,28 +462,32 @@
         exit 1;
     fi
 
-    if [ X"" == X"$RELEASEDIR" ]; then
-        echo "ERROR: no source for etc!" >&2
-        exit 1
-    fi
-
-    cd $RELEASEDIR
-
     local _v=$FILE_VER
     local _args=""
-    if [ -e etc${_v}.tgz ]; then
-        _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz"
+
+    if [ ! -e /usr/share/sysmerge/etc.tgz ]; then
+        if [ X"" == X"$RELEASEDIR" ]; then
+            echo "ERROR: no source for etc!" >&2
+            exit 1
+        fi
+
+        cd $RELEASEDIR
+
+        if [ -e etc${_v}.tgz ]; then
+            _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz"
+        fi
+        if [ -e xetc${_v}.tgz ]; then
+            _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz"
+        fi
+        if [ X"" == X"$_args" ]; then 
+            echo ERROR: No upgrade sets found! >&2
+            exit 1
+        fi
     fi
-    if [ -e xetc${_v}.tgz ]; then
-        _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz"
-    fi
-    if [ X"" == X"$_args" ]; then 
-        echo ERROR: No upgrade sets found! >&2
-    else
-        echo '==> RUNNING SYSMERGE'
-        $SYSMERGE $_args
-    fi
 
+    echo '==> RUNNING SYSMERGE'
+    $SYSMERGE $_args
+
     cd $OLDPWD
 }
 
@@ -589,7 +593,7 @@
 
     if [ -e /sbin/oreboot ]; then
         echo Removing /sbin/oreboot
-        $rm -f /sbin/oreboot
+        rm -f /sbin/oreboot
     fi
     update_etc