===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openbsd/update_openbsd/update_openbsd	2014/02/01 19:13:53	1.65
+++ openbsd/update_openbsd/update_openbsd	2014/02/01 22:07:04	1.66
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.64 2014/02/01 16:31:51 andrew Exp $
+# $AFresh1: update_openbsd,v 1.65 2014/02/01 19:13:53 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -558,26 +558,27 @@
     NEW_KERNEL_VERSION=$BOOT_KERNEL_VERSION
 fi
 
-if [ $CUR_VER != $NEW_VER ]; then
+if [ X"$NEW_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" ]; then
     echo >&2
-    echo "!!! You are upgrading between OpenBSD versions.     !!!" >&2
-    echo "!!! You should make sure you have a root shell open !!!" >&2
-    echo "!!! It is needed in order to run /sbin/oreboot.     !!!" >&2
-    echo "!!! sudo MAY NOT WORK after sets are extracted.     !!!" >&2
+    echo "!!!  You are upgrading the OpenBSD kernel.        !!!" >&2
+    echo "!!!  You will be given the opportunity to reboot  !!!" >&2
+    echo "!!!  at the end of the proces but it is safer to  !!!" >&2 
+    echo "!!!  have a separate root shell open.             !!!" >&2
+    echo "!!!  It is needed in order to run /sbin/oreboot.  !!!" >&2
+    echo "!!!  sudo MAY NOT WORK after sets are extracted.  !!!" >&2
     echo >&2
-    echo "ctrl+C to cancel, enter to continue" >&2
+    echo "enter to continue, ctrl+C to cancel" >&2
     local _temp
     read _temp
-fi
 
-if [ X"$NEW_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" \
-     -a ! -e /sbin/oreboot ]; then
-    cp /sbin/reboot /sbin/oreboot
-    if [ $? -ne 0 ]; then
-        echo "Error copying old reboot command!" >&2
-        exit 1
+    if [ ! -e /sbin/oreboot ]; then
+        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
-    echo "/sbin/reboot copied to /sbin/oreboot"
 fi
 
 install_kernels
@@ -604,9 +605,10 @@
     fi
 fi
 
-echo Update complete press any key to reboot, ctrl+C to cancel
+echo Update complete. enter to reboot, ctrl+C to cancel
 read _temp
 if [ -e /sbin/oreboot ]; then
+    echo using /sbin/oreboot
     /sbin/oreboot
 else
     /sbin/reboot