===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- openbsd/update_openbsd/update_openbsd	2009/12/10 06:51:28	1.29
+++ openbsd/update_openbsd/update_openbsd	2009/12/10 18:21:51	1.30
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.28 2009/12/10 06:09:40 andrew Exp $
+# $RedRiver: update_openbsd,v 1.29 2009/12/10 06:51:28 andrew Exp $
 
 installed_sets() {
     local misc=/usr/share/doc/README
@@ -265,7 +265,7 @@
 }
 
 
-install_kernel() {
+install_kernels() {
     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
@@ -320,7 +320,7 @@
                 _installed_new_bsd=1
             fi
         else
-            if [ -e /$_b ]; then
+            if [ -e "/${_b}" ]; then
                 echo Copying $_b to /
                 $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}
                 if [ $? -ne 0 ]; then
@@ -450,6 +450,7 @@
         fi
 
         local _v=$FILE_VER
+        local _args=""
         if [ -e etc${_v}.tgz ]; then
             _args="$_args -s etc${_v}.tgz"
         fi
@@ -524,7 +525,7 @@
     $SUDO -v
 fi
 
-install_kernel
+install_kernels
 install_sets
 
 if [ $CUR_VER == $NEW_VER ]; then
@@ -539,7 +540,11 @@
 
 else
     echo Instructions for updating to the new version available from 
-    echo "  http://www.openbsd.org/faq/upgrade${FILE_VER}.html"
+    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"
+    fi
 fi
 
 echo New kernel installed.  Please reboot!