===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.50
retrieving revision 1.53
diff -u -r1.50 -r1.53
--- openbsd/update_openbsd/update_openbsd	2013/10/20 01:18:04	1.50
+++ openbsd/update_openbsd/update_openbsd	2013/11/09 21:58:26	1.53
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.49 2013/10/20 00:13:38 andrew Exp $
+# $AFresh1: update_openbsd,v 1.52 2013/10/20 00:26:35 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -415,7 +415,9 @@
     done
 
     echo Extracted all sets.
+}
 
+install_sendmail_smtp_auth() {
     if [ -e ${RELEASEDIR}/sendmail-smtp_auth.gz ]; then
         gzcat ${RELEASEDIR}/sendmail-smtp_auth.gz > \
             ${RELEASEDIR}/sendmail-smtp_auth
@@ -529,6 +531,7 @@
     echo "ctrl+C to cancel, enter to continue anyway" >&2
     local _temp
     read _temp
+    NEW_KERNEL_VERSION=$BOOT_KERNEL_VERSION
 fi
 
 if [ -n "$SUDO" -a $CUR_VER != $NEW_VER ]; then
@@ -549,7 +552,7 @@
     $SUDO -v -p "sudo Password: "
 fi
 
-if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
+if [ X"$NEW_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
      -a ! -e /sbin/oreboot ]; then
     $SUDO cp /sbin/reboot /sbin/oreboot
     if [ $? -ne 0 ]; then
@@ -562,7 +565,9 @@
 install_kernels
 install_sets
 
-if [ X"$BOOT_KERNEL_VERSION" == X"$BOOTED_KERNEL_VERSION" ]; then
+if [ X"$NEW_KERNEL_VERSION" == X"$BOOTED_KERNEL_VERSION" ]; then
+    install_sendmail_smtp_auth
+
     if [ -e /sbin/oreboot ]; then
         echo Removing /sbin/oreboot
         $SUDO rm -f /sbin/oreboot
@@ -584,14 +589,4 @@
 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