=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- openbsd/update_openbsd/update_openbsd 2013/10/20 01:13:38 1.49 +++ openbsd/update_openbsd/update_openbsd 2013/10/20 01:18:04 1.50 @@ -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.49 2013/10/20 00:13:38 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -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 @@ -557,6 +547,16 @@ echo echo You may be asked for your sudo password multiple times. $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