===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.30
retrieving revision 1.37
diff -u -r1.30 -r1.37
--- openbsd/update_openbsd/update_openbsd	2009/12/10 18:21:51	1.30
+++ openbsd/update_openbsd/update_openbsd	2010/06/17 23:39:09	1.37
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.29 2009/12/10 06:51:28 andrew Exp $
+# $AFresh1: update_openbsd,v 1.36 2010/06/17 20:35:47 andrew Exp $
 
 installed_sets() {
     local misc=/usr/share/doc/README
@@ -24,7 +24,7 @@
         fi
     done
 
-    sendmail -d0.1 -bt < /dev/null | grep -q SASL
+    sendmail -d0.1 --badoption </dev/null 2>/dev/null | grep -q SASL
     if [ $? == 0 ]; then 
         echo -n ' sendmail-smtp_auth'
     fi
@@ -193,13 +193,13 @@
 
 follow_symlink () {
     local _file=$1
-    local _next=$( file $_file |
-        grep 'symbolic link' | 
-        sed -e s/^.*\\\`// -e s/\\\'\$// )
-    if [ -h $_next ]; then
-        follow_symlink $_next
+    # This could go circular, but I dunno how to fix that.
+    if [ -h $_file ]; then
+        follow_symlink $( file $_file |
+            grep 'symbolic link' | 
+            sed -e s/^.*\\\`// -e s/\\\'\$// )
     else
-        echo $_next
+        echo $_file
     fi
 }
 
@@ -337,10 +337,10 @@
     if [ ! -h /bsd ]; then
         if [ -e /bsd.mp ]; then
             echo linking /bsd.mp to /bsd
-            $SUDO ln -sf /bsd.mp /bsd
+            $SUDO ln -sf /bsd.mp bsd
         else
             echo linking /bsd.sp to /bsd
-            $SUDO ln -sf /bsd.sp /bsd
+            $SUDO ln -sf /bsd.sp bsd
         fi
         if [ $? -ne 0 ]; then
             echo ERROR: Could not symlink new kernel! >&2
@@ -540,7 +540,7 @@
 
 else
     echo Instructions for updating to the new version available from 
-    if [ X"snapshots" != X"$FORCE_DIR" ]; then
+    if [ X"snapshots" == X"$FORCE_DIR" ]; then
         echo "  http://www.openbsd.org/faq/current.html"
     else
         echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"
@@ -550,4 +550,14 @@
 echo New kernel installed.  Please reboot!
 if [ -e /sbin/oreboot ]; then
     echo Possibly using /sbin/oreboot
+fi
+
+local _send_dmesg=`dirname $0`/send_dmesg 
+if [ -e "$_send_dmesg" ]; then
+    if [ -e $RELEASEDIR/.send_dmesg ]; then
+        $_send_dmesg
+        rm -f $RELEASEDIR/.send_dmesg
+    elif [ X"$CUR_VER" != X"$NEW_VER" ]; then
+        touch $RELEASEDIR/.send_dmesg
+    fi
 fi