===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.24
retrieving revision 1.29
diff -u -r1.24 -r1.29
--- openbsd/update_openbsd/update_openbsd	2009/05/29 22:47:37	1.24
+++ openbsd/update_openbsd/update_openbsd	2009/12/10 06:51:28	1.29
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.23 2009/05/14 23:00:46 andrew Exp $
+# $RedRiver: update_openbsd,v 1.28 2009/12/10 06:09:40 andrew Exp $
 
 installed_sets() {
     local misc=/usr/share/doc/README
@@ -304,6 +304,7 @@
     fi
 
     local _true_bsd=`follow_symlink /bsd`
+    _true_bsd=${_true_bsd#/}
     local _installed_new_bsd
 
     for _b in bsd*; do
@@ -315,7 +316,7 @@
                 echo ERROR: Could not copy new SP kernel! >&2
                 exit 1
             fi
-            if [ X"${_true_bsd}" == X"bsd" ]; then
+            if [ X"${_true_bsd}" == X"bsd.sp" ]; then
                 _installed_new_bsd=1
             fi
         else
@@ -459,7 +460,9 @@
             echo ERROR: No upgrade sets found! >&2
         else
             echo '### RUNNING SYSMERGE ###'
-            _args="-a $_args"
+            if sysmerge 2>&1 | grep -- -a >/dev/null; then
+                _args="-a $_args"
+            fi
             $SUDO $SYSMERGE $_args
         fi
     fi
@@ -536,7 +539,7 @@
 
 else
     echo Instructions for updating to the new version available from 
-    echo "  http://www.openbsd.org/faq/upgrade${_v}.html"
+    echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"
 fi
 
 echo New kernel installed.  Please reboot!