=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.55 retrieving revision 1.69 diff -u -r1.55 -r1.69 --- openbsd/update_openbsd/update_openbsd 2013/12/28 02:56:24 1.55 +++ openbsd/update_openbsd/update_openbsd 2014/10/19 00:05:49 1.69 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.54 2013/12/28 02:55:28 andrew Exp $ +# $AFresh1: update_openbsd,v 1.68 2014/10/18 22:42:35 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -18,7 +18,7 @@ installed_sets() { local misc=/usr/share/doc/README - local man=/usr/share/man/cat1/intro.0 + local man=/usr/share/man/man1/intro.1 local comp=/usr/bin/cc local game=/usr/games/ local xbase=/usr/X11R6/ @@ -157,7 +157,11 @@ fi if [ X"" == X"${_v}" ]; then - echo ERROR: Unable to determine file version! >&2 + if [ X"" == X"${MIRROR}" ]; then + echo ERROR: No sets, and no MIRROR, unable to continue. >&2 + else + echo ERROR: Unable to determine FILE_VER, check your MIRROR. >&2 + fi return 1 fi @@ -234,10 +238,12 @@ done local _type + local _ftp for _type in $CHECKSUM_TYPES; do [ -e $_type ] && break - echo "===> $FTP_CMD ${FTP}/$_type" - $FTP_CMD ${FTP}/$_type + _ftp=`echo "$FTP" | sed -e 's,://[^/]*/,://ftp.openbsd.org/,'` + echo "===> $FTP_CMD ${_ftp}/$_type" + $FTP_CMD ${_ftp}/$_type done } @@ -263,9 +269,28 @@ return 1 fi - ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index - grep -f index $_type | sum -c + local _nv=`echo $NEW_VER | sed -e 's/\.//'` + local _signify=`which signify 2>/dev/null` + local _keyfile=/etc/signify/openbsd-${_nv}-base.pub + local _b _s + ( + for _b in $INSTALL_KERNELS; do echo "($_b)" ; done + for _s in $INSTALLED_SETS; do echo "($_s$_nv.tgz)"; done + ) > index + + + if [ -n "$_signify" -a "$_type" != "${_type%.sig}" ]; then + echo "===> Checking signature"; + if [ ! -e $_keyfile ]; then + echo "key [$_keyfile] does not exist, cannot check $_type" >&2 + return 2 + fi + signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sha256 -c - + else + grep -f index $_type | sum -c + fi + if [ $? -ne 0 ]; then echo ERROR: $_type does not match! >&2 return 1 @@ -315,19 +340,17 @@ local _type for _type in $CHECKSUM_TYPES; do if [ -e $_type ]; then - check_sum $_type - [ $? -ne 0 -a -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1 + check_sum $_type && break + [ -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1 fi done + + return 0 } 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 - exit 1 - fi if [ X"" == X"$RELEASEDIR" ]; then echo ERROR: no source for new kernels! >&2 @@ -336,7 +359,7 @@ if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then echo "===> Backing up $BOOT_KERNEL to /obsd" - $SUDO ln -f $BOOT_KERNEL /obsd + ln -f $BOOT_KERNEL /obsd if [ $? -ne 0 ]; then echo "Error copying old kernel!" >&2 exit 1 @@ -346,7 +369,7 @@ cd $RELEASEDIR for _b in $INSTALL_KERNELS; do - $SUDO rm -f /nbsd + rm -f /nbsd local _bd=$_b [ X"${_b}" == X"bsd" ] && _bd="bsd.sp" @@ -354,7 +377,7 @@ [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel" echo "===> Copying $_b to /$_bd $_is_boot" - $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_bd} + cp ${_b} /nbsd && mv /nbsd /${_bd} if [ $? -ne 0 ]; then echo ERROR: Could not copy new $_bd kernel! >&2 exit 1 @@ -369,7 +392,7 @@ [ X"$_b" == X"bsd" ] && _b="bsd.sp" if [ -e $_b ]; then echo "===> symlinking $_b to /bsd" - $SUDO ln -sf $_b bsd + ln -sf $_b bsd if [ $? -ne 0 ]; then echo ERROR: Could not symlink new kernel! >&2 exit 1 @@ -383,10 +406,6 @@ install_sets() { echo '==> INSTALLING SETS' - if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then - echo ${0##*/} must be run as root or SUDO must be set! >&2 - exit 1 - fi if [ X"" == X"$RELEASEDIR" ]; then echo ERROR: no source for sets! >&2 @@ -407,8 +426,8 @@ fi echo "===> Extracting $_f to $_path" - $SUDO mkdir -p $_path - $SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f} + mkdir -p $_path + tar -C $_path -xzphf ${RELEASEDIR}/${_f} if [ $? -ne 0 ]; then echo ERROR: Could not extract ${_f}! >&2 exit 1 @@ -425,10 +444,10 @@ fi if [ -e ${RELEASEDIR}/sendmail-smtp_auth ]; then if ! pkg_info -qe 'cyrus-sasl-*'; then - $SUDO pkg_add -i cyrus-sasl + pkg_add -i cyrus-sasl fi - $SUDO install -o root -g smmsp -m 2555 \ + install -o root -g smmsp -m 2555 \ ${RELEASEDIR}/sendmail-smtp_auth \ /usr/libexec/sendmail/sendmail @@ -443,32 +462,41 @@ exit 1; fi - if [ X"" == X"$RELEASEDIR" ]; then - echo "ERROR: no source for etc!" >&2 - exit 1 - fi - - cd $RELEASEDIR - local _v=$FILE_VER local _args="" - if [ -e etc${_v}.tgz ]; then - _args="$_args -s etc${_v}.tgz" + + if [ ! -e /usr/share/sysmerge/etc.tgz ]; then + if [ X"" == X"$RELEASEDIR" ]; then + echo "ERROR: no source for etc!" >&2 + exit 1 + fi + + cd $RELEASEDIR + + if [ -e etc${_v}.tgz ]; then + _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz" + fi + if [ -e xetc${_v}.tgz ]; then + _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" + fi + if [ X"" == X"$_args" ]; then + echo ERROR: No upgrade sets found! >&2 + exit 1 + fi fi - if [ -e xetc${_v}.tgz ]; then - _args="$_args -x xetc${_v}.tgz" - fi - if [ X"" == X"$_args" ]; then - echo ERROR: No upgrade sets found! >&2 - else - echo '==> RUNNING SYSMERGE' - $SUDO $SYSMERGE $_args - fi + echo '==> RUNNING SYSMERGE' + $SYSMERGE $_args + cd $OLDPWD } +if [ $(id -u) != 0 ]; then + echo 'ERROR: need root privileges to run this script' >&2 + exit 1 +fi + if [ -e /etc/update_openbsd.conf ]; then . /etc/update_openbsd.conf fi @@ -487,7 +515,7 @@ INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} -CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256 MD5} +CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256} set_version local _error=$? @@ -496,7 +524,6 @@ echo "-= update_openbsd - helper script to update OpenBSD =-" echo "------------------------------------------------------" echo -echo " SUDO: $SUDO" echo " SYSMERGE: $SYSMERGE" echo " MIRROR: $MIRROR" echo " RELEASEDIR: $RELEASEDIR" @@ -535,32 +562,27 @@ NEW_KERNEL_VERSION=$BOOT_KERNEL_VERSION fi -if [ -n "$SUDO" -a $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 [ -n "$SUDO" ]; then - echo - echo You may be asked for your sudo password multiple times. - $SUDO -v -p "sudo Password: " -fi - -if [ X"$NEW_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 + 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 @@ -571,12 +593,12 @@ if [ -e /sbin/oreboot ]; then echo Removing /sbin/oreboot - $SUDO rm -f /sbin/oreboot + rm -f /sbin/oreboot fi update_etc echo '==> UPDATING PACKAGES' - $SUDO pkg_add -ui -F update -F updatedepends + pkg_add -ui -F update -F updatedepends else echo Instructions for updating to the new version available from @@ -587,7 +609,11 @@ fi fi -echo New kernel installed. Please reboot! +echo Update complete. enter to reboot, ctrl+C to cancel +read _temp if [ -e /sbin/oreboot ]; then - echo Possibly using /sbin/oreboot + echo using /sbin/oreboot + /sbin/oreboot +else + /sbin/reboot fi