===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.48
retrieving revision 1.54
diff -u -r1.48 -r1.54
--- openbsd/update_openbsd/update_openbsd	2013/01/26 18:13:03	1.48
+++ openbsd/update_openbsd/update_openbsd	2013/12/28 02:55:28	1.54
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.47 2012/12/16 06:56:15 andrew Exp $
+# $AFresh1: update_openbsd,v 1.53 2013/11/09 21:58:26 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -203,7 +203,7 @@
 }
 
 get_sets() {
-    echo '### GETTING SETS ###'
+    echo '==> GETTING SETS'
     if [ X"" == X"$FTP" ]; then
         echo ERROR: No FTP site set! >&2
         return 1
@@ -216,7 +216,7 @@
 
     for _b in $INSTALL_KERNELS; do
         if [ ! -e ./${_b} ]; then
-            echo $FTP_CMD ${FTP}/${_b}
+            echo "===> $FTP_CMD ${FTP}/${_b}"
             $FTP_CMD ${FTP}/${_b}
         fi
     done
@@ -228,7 +228,7 @@
         fi
 
         if [ ! -e ./${_file} ]; then
-            echo $FTP_CMD ${FTP}/${_file}
+            echo "===> $FTP_CMD ${FTP}/${_file}"
             $FTP_CMD ${FTP}/${_file}
         fi
     done
@@ -236,7 +236,7 @@
     local _type
     for _type in $CHECKSUM_TYPES; do
         [ -e $_type ] && break
-        echo $FTP_CMD ${FTP}/$_type
+        echo "===> $FTP_CMD ${FTP}/$_type"
         $FTP_CMD ${FTP}/$_type
     done
 }
@@ -255,7 +255,7 @@
 
 check_sum () {
     local _type=$1
-    echo "### CHECKING $_type SUMS ###"
+    echo "==> CHECKING $_type SUMS"
     cd $RELEASEDIR
 
     if [ ! -e $_type ]; then
@@ -264,7 +264,7 @@
     fi
 
     ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index 
-    grep -f index $_type | sum -c 
+    grep -f index $_type | sum -c
 
     if [ $? -ne 0 ]; then
         echo ERROR: $_type does not match! >&2
@@ -273,7 +273,7 @@
 }
 
 check_sets() {
-    echo '### CHECKING SETS ###'
+    echo '==> CHECKING SETS'
     cd $RELEASEDIR
 
     local _missing_sets
@@ -309,7 +309,7 @@
     done
 
     if [ X"" == X"${_missing_sets}" ]; then
-        echo All OK
+        echo '===> All OK'
     fi
 
     local _type
@@ -322,7 +322,7 @@
 
 
 install_kernels() {
-    echo '### INSTALLING KERNEL ###'
+    echo '==> INSTALLING KERNEL'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2
         exit 1
@@ -334,7 +334,7 @@
     fi
 
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
-        echo "Backing up $BOOT_KERNEL to /obsd"
+        echo "===> Backing up $BOOT_KERNEL to /obsd"
         $SUDO ln -f $BOOT_KERNEL /obsd
         if [ $? -ne 0 ]; then
             echo "Error copying old kernel!" >&2
@@ -352,7 +352,7 @@
         local _is_boot=""
         [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"
         
-        echo "Copying $_b to /$_bd $_is_boot"
+        echo "===> Copying $_b to /$_bd $_is_boot"
         $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_bd}
         if [ $? -ne 0 ]; then
             echo ERROR: Could not copy new $_bd kernel! >&2
@@ -367,7 +367,7 @@
         for _b in $BOOT_KERNELS; do
             [ X"$_b" == X"bsd" ] && _b="bsd.sp"
             if [ -e $_b ]; then
-                echo symlinking $_b to /bsd
+                echo "===> symlinking $_b to /bsd"
                 $SUDO ln -sf $_b bsd
                 if [ $? -ne 0 ]; then
                     echo ERROR: Could not symlink new kernel! >&2
@@ -381,7 +381,7 @@
 }
 
 install_sets() {
-    echo '### INSTALLING SETS ###'
+    echo '==> INSTALLING SETS'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2
         exit 1
@@ -396,15 +396,6 @@
 
     local _v=$FILE_VER
 
-    if [ $CUR_VER != $NEW_VER -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
@@ -414,7 +405,7 @@
             _path=/var/tmp/temproot
         fi
 
-        echo Extracting $_f to $_path
+        echo "===> Extracting $_f to $_path"
         $SUDO mkdir -p $_path
         $SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f}
         if [ $? -ne 0 ]; then
@@ -423,8 +414,10 @@
         fi
     done
 
-    echo Extracted all sets.
+    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
@@ -438,12 +431,12 @@
             ${RELEASEDIR}/sendmail-smtp_auth \
             /usr/libexec/sendmail/sendmail
 
-        echo Installed sendmail with smtp_auth
+        echo '===> Installed sendmail with smtp_auth'
     fi
 }
 
 update_etc() {
-    echo '### UPDATING ETC ###'
+    echo '==> UPDATING ETC'
     if [ ! -e $SYSMERGE ]; then
         echo "ERROR: Can't find sysmerge!" >&2
         exit 1;
@@ -467,7 +460,7 @@
     if [ X"" == X"$_args" ]; then 
         echo ERROR: No upgrade sets found! >&2
     else
-        echo '### RUNNING SYSMERGE ###'
+        echo '==> RUNNING SYSMERGE'
         $SUDO $SYSMERGE $_args
     fi
 
@@ -526,18 +519,19 @@
 
 check_sets || exit
 
-echo "Last booted:\n$BOOTED_KERNEL_VERSION"
+echo "===> Last booted:\n$BOOTED_KERNEL_VERSION"
 if [ X"$BOOT_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
   -a X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
     echo "Next boot (unless replaced):\n$BOOT_KERNEL_VERSION"
 fi
 if [ -n "$NEW_KERNEL_VERSION" ]; then
-    echo "New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION";
+    echo "===> New $BOOT_KERNEL:\n$NEW_KERNEL_VERSION";
 else
     echo "\n!!! WARNING: Will not replace boot kernel $BOOT_KERNEL! !!!\n" >&2
     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
@@ -558,17 +552,29 @@
     $SUDO -v -p "sudo Password: "
 fi
 
+if [ X"$NEW_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 [ $CUR_VER == $NEW_VER ]; 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
     fi
     update_etc
 
-    echo '### UPDATING PACKAGES ###'
+    echo '==> UPDATING PACKAGES'
     $SUDO pkg_add -ui -F update -F updatedepends
 
 else
@@ -583,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