===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.23
retrieving revision 1.27
diff -u -r1.23 -r1.27
--- openbsd/update_openbsd/update_openbsd	2009/05/15 00:00:46	1.23
+++ openbsd/update_openbsd/update_openbsd	2009/12/04 04:26:36	1.27
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.22 2009/05/13 16:40:50 andrew Exp $
+# $RedRiver: update_openbsd,v 1.26 2009/10/26 19:52:23 andrew Exp $
 
 installed_sets() {
     local misc=/usr/share/doc/README
@@ -24,7 +24,7 @@
         fi
     done
 
-    sendmail -d0.1 root < /dev/null | grep -q SASL
+    sendmail -d0.1 -bt < /dev/null | grep -q SASL
     if [ $? == 0 ]; then 
         echo -n ' sendmail-smtp_auth'
     fi
@@ -315,7 +315,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
@@ -326,7 +326,7 @@
                     echo ERROR: Could not copy new $_b kernel! >&2
                     exit 1
                 fi
-                if [ X"${_true_bsd}" == X"${_b}" ]; then
+                if [ X"${_true_bsd}" == X"/${_b}" ]; then
                     _installed_new_bsd=1
                 fi
             fi
@@ -459,7 +459,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