===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- openbsd/update_openbsd/update_openbsd	2012/04/19 05:03:47	1.38
+++ openbsd/update_openbsd/update_openbsd	2012/12/08 19:52:08	1.39
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.37 2010/06/17 22:39:09 andrew Exp $
+# $AFresh1: update_openbsd,v 1.38 2012/04/19 04:03:47 andrew Exp $
 
 installed_sets() {
     local misc=/usr/share/doc/README
@@ -30,6 +30,11 @@
     fi
 }
 
+kernel_file_version() {
+    echo exit | config -e $1 | grep -A1 ^OpenBSD
+    #what $1 | sed -ne 's/[[:blank:]]\{1,\}//p'
+}
+
 version_in() {
         local _proto=${FTP%%://*}
         local _file
@@ -149,6 +154,33 @@
     if [ X"" != X"${MIRROR}" ]; then
         FTP=${MIRROR}/${_dir}/`machine`
     fi
+
+    BOOT_KERNEL=`( \
+        echo bsd; \
+        [ -e /boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \
+            s///; s/^.*://; s/ .*$//' /boot.conf \
+    ) | tail -1`
+    BOOT_KERNEL="/${BOOT_KERNEL#/}"
+    BOOT_KERNEL=`follow_symlink $BOOT_KERNEL`
+
+    BOOT_KERNEL_VERSION=`kernel_file_version $BOOT_KERNEL`
+
+    BOOTED_KERNEL_VERSION=`sysctl -n kern.version`
+    NEW_KERNEL_VERSION=""
+
+    # We want to default to what we had
+    INSTALL_KERNELS="${BOOT_KERNEL#/}"
+    # with a second option of an mp kernel if is is a likely candidate
+    if [ X"$INSTALL_KERNELS" != X"bsd.mp" ]; then
+        local _ncpu=$(sysctl -n hw.ncpufound)
+        [ $_ncpu -gt 1 ] && INSTALL_KERNELS="$INSTALL_KERNELS bsd.mp"
+    fi
+    # or just bsd otherwise
+    if [ X"${INSTALL_KERNELS% *}" != X"bsd" ]; then
+        INSTALL_KERNELS="$INSTALL_KERNELS bsd"
+    fi
+    BOOT_KERNELS=$INSTALL_KERNELS
+    INSTALL_KERNELS="$INSTALL_KERNELS bsd.rd"
 }
 
 get_sets() {
@@ -163,7 +195,7 @@
 
     local _v=$FILE_VER
 
-    for _b in `echo /bsd* bsd bsd.mp bsd.rd | sort -u`; do
+    for _b in $INSTALL_KERNELS; do
         if [ -e /${_b} -a ! -e ./${_b} ]; then
             echo $FTP_CMD ${FTP}/${_b}
             $FTP_CMD ${FTP}/${_b}
@@ -229,18 +261,24 @@
     local _missing_sets
     local _v=$FILE_VER
 
-    for _b in `echo /bsd* bsd bsd.mp bsd.rd | sort -u`; do
-	_b=${_b#/}
-        local _n=$_b
-        if [ X"bsd.sp" == X"${_n}" ]; then
-            _n=bsd
-        fi
-        if [ -e /${_b} -a ! -e ./${_n} ]; then
-            echo ${_n} does not exist
+    for _n in $INSTALL_KERNELS; do
+        local _o=$_n
+        [ X"bsd" == X"${_o}" -a -e /bsd.sp ] && _o=bsd.sp
+        if [ -e /${_o} -a ! -e ./${_n} ]; then
+            echo ${_o} does not exist
             _missing_sets=1
         fi
+
+        if [ X"${BOOT_KERNEL}" == X"/${_o}" -a -e ./${_n} ]; then
+            NEW_KERNEL_VERSION=`kernel_file_version ./${_n}`
+        fi
     done
 
+    if [ X"$NEW_KERNEL_VERSION" == X"" ]; then
+        echo Missing replacement for boot kernel $BOOT_KERNEL >&2
+        _missing_sets=1
+    fi
+
     for _s in $INSTALLED_SETS; do
         local _file=${_s}${_v}.tgz
         if [ ${_s} == sendmail-smtp_auth ]; then
@@ -275,83 +313,50 @@
     if [ X"" == X"$RELEASEDIR" ]; then
         echo ERROR: no source for new kernels! >&2
         exit 1
-    else
-        cd $RELEASEDIR
     fi
 
-    if [ ! -e bsd ]; then
-        echo ERROR: new bsd kernel does not exist! >&2
-        exit 1
-    fi
-
-    if [ -e /bsd.mp -a ! -e bsd.mp ]; then
-        echo ERROR: new bsd.mp kernel does not exist! >&2
-        exit 1
-    fi
-
-    if [ ! -e bsd.rd ]; then
-        echo ERROR: new bsd.rd kernel does not exist! >&2
-        exit 1
-    fi
-
-    local _v=$FILE_VER
-
-    $SUDO rm -f /obsd
-    $SUDO ln /bsd /obsd
+    echo "Backing up $BOOT_KERNEL to /obsd"
+    $SUDO ln -f $BOOT_KERNEL /obsd
     if [ $? -ne 0 ]; then
         echo "Error copying old kernel!" >&2
         exit 1
     fi
 
-    local _true_bsd=`follow_symlink /bsd`
-    _true_bsd=${_true_bsd#/}
-    local _installed_new_bsd
+    cd $RELEASEDIR
 
-    for _b in bsd*; do
+    for _b in $INSTALL_KERNELS; do
         $SUDO rm -f /nbsd
-        if [ X"${_b}" == X"bsd" ]; then
-            echo Copying bsd to /bsd.sp
-            $SUDO cp bsd /nbsd && $SUDO mv /nbsd /bsd.sp
-            if [ $? -ne 0 ]; then
-                echo ERROR: Could not copy new SP kernel! >&2
-                exit 1
-            fi
-            if [ X"${_true_bsd}" == X"bsd.sp" ]; then
-                _installed_new_bsd=1
-            fi
-        else
-            if [ -e "/${_b}" ]; then
-                echo Copying $_b to /
-                $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}
-                if [ $? -ne 0 ]; then
-                    echo ERROR: Could not copy new $_b kernel! >&2
-                    exit 1
-                fi
-                if [ X"${_true_bsd}" == X"${_b}" ]; then
-                    _installed_new_bsd=1
-                fi
-            fi
-        fi
-    done
+        local _bd=$_b
+        [ X"${_b}" == X"bsd" ] && _bd="bsd.sp"
 
-    if [ ! -h /bsd ]; then
-	cd /
-        if [ -e /bsd.mp ]; then
-            echo linking /bsd.mp to /bsd
-            $SUDO ln -sf /bsd.mp bsd
-        else
-            echo linking /bsd.sp to /bsd
-            $SUDO ln -sf /bsd.sp bsd
-        fi
+        local _is_boot=""
+        [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"
+        
+        echo "Copying $_b to /$_bd $_is_boot"
+        $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_bd}
         if [ $? -ne 0 ]; then
-            echo ERROR: Could not symlink new kernel! >&2
+            echo ERROR: Could not copy new $_bd kernel! >&2
             exit 1
         fi
-	cd $OLDPWD
-    fi
+    done
 
-    if [ -z $_installed_new_bsd ]; then
-        echo WARNING: Did not replace $_true_bsd kernel >&2
+    cd $OLDPWD
+
+    if [ ! -h /bsd ]; then
+	    cd /
+        for _b in $BOOT_KERNELS; do
+            [ X"$_b" == X"bsd" ] && _b="bsd.sp"
+            if [ -e $_b ]; then
+                echo symlinking $_b to /bsd
+                $SUDO ln -sf $_b bsd
+                if [ $? -ne 0 ]; then
+                    echo ERROR: Could not symlink new kernel! >&2
+                    exit 1
+                fi
+                break
+            fi
+        done
+	    cd $OLDPWD
     fi
 }
 
@@ -499,16 +504,18 @@
 echo "-= update_openbsd - helper script to update OpenBSD =-"
 echo "------------------------------------------------------"
 echo
-echo "          SUDO: $SUDO"
-echo "      SYSMERGE: $SYSMERGE"
-echo "        MIRROR: $MIRROR"
-echo "    RELEASEDIR: $RELEASEDIR"
-echo "       DESTDIR: $DESTDIR"
-echo "INSTALLED_SETS: $INSTALLED_SETS"
+echo "           SUDO: $SUDO"
+echo "       SYSMERGE: $SYSMERGE"
+echo "         MIRROR: $MIRROR"
+echo "     RELEASEDIR: $RELEASEDIR"
+echo "        DESTDIR: $DESTDIR"
+echo "    BOOT_KERNEL: $BOOT_KERNEL"
+echo "INSTALL_KERNELS: $INSTALL_KERNELS"
+echo " INSTALLED_SETS: $INSTALLED_SETS"
 echo
-echo "       CUR_VER: $CUR_VER"
-echo "       NEW_VER: $NEW_VER"
-#echo "      FILE_VER: $FILE_VER"
+echo "        CUR_VER: $CUR_VER"
+echo "        NEW_VER: $NEW_VER"
+#echo "       FILE_VER: $FILE_VER"
 echo
 
 if [ ${_error} -ne 0 ]; then
@@ -520,6 +527,20 @@
 fi
 
 check_sets || exit
+
+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";
+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
+fi
 
 if [ X"" != X"$SUDO" ]; then
     echo Please enter your sudo password if prompted.