=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.42 retrieving revision 1.44 diff -u -r1.42 -r1.44 --- openbsd/update_openbsd/update_openbsd 2012/12/09 03:41:41 1.42 +++ openbsd/update_openbsd/update_openbsd 2012/12/09 04:08:37 1.44 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.41 2012/12/08 19:55:39 andrew Exp $ +# $AFresh1: update_openbsd,v 1.43 2012/12/09 04:06:57 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -556,10 +556,22 @@ read _temp fi -if [ X"" != X"$SUDO" ]; then - echo Please enter your sudo password if prompted. - echo You may be asked for it again later in the process. - $SUDO -v +if [ -n "$SUDO" -a $CUR_VER != $NEW_VER ]; 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 >&2 + echo "ctrl+C to cancel, enter to continue" >&2 + local _temp + read _temp +fi + +if [ -n "$SUDO" ]; then + echo + echo You may be asked for your sudo password multiple times. + $SUDO -v -p "sudo Password: " fi install_kernels