===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.49
retrieving revision 1.52
diff -u -r1.49 -r1.52
--- openbsd/update_openbsd/update_openbsd	2013/10/20 01:13:38	1.49
+++ openbsd/update_openbsd/update_openbsd	2013/10/20 01:26:35	1.52
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.48 2013/01/26 18:13:03 andrew Exp $
+# $AFresh1: update_openbsd,v 1.51 2013/10/20 00:23:05 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -396,16 +396,6 @@
 
     local _v=$FILE_VER
 
-    if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
-         -a ! -e /sbin/oreboot ]; then
-        $SUDO cp /sbin/reboot /sbin/oreboot
-        if [ $? -ne 0 ]; then
-            echo "Error copying old reboot command!" >&2
-            exit 1
-        fi
-        echo "/sbin/reboot copied to /sbin/oreboot"
-    fi
-
     local _sets=`ls *${_v}.tgz | grep -v ^base `
     for _f in ${_sets} base${_v}.tgz; do
         _path=$DESTDIR
@@ -425,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
@@ -559,10 +551,22 @@
     $SUDO -v -p "sudo Password: "
 fi
 
+if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
+     -a ! -e /sbin/oreboot ]; then
+    $SUDO cp /sbin/reboot /sbin/oreboot
+    if [ $? -ne 0 ]; then
+        echo "Error copying old reboot command!" >&2
+        exit 1
+    fi
+    echo "/sbin/reboot copied to /sbin/oreboot"
+fi
+
 install_kernels
 install_sets
 
 if [ X"$BOOT_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 +588,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