=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.3 retrieving revision 1.104 diff -u -r1.3 -r1.104 --- openbsd/update_openbsd/update_openbsd 2008/08/12 23:42:09 1.3 +++ openbsd/update_openbsd/update_openbsd 2017/12/11 02:53:13 1.104 @@ -1,345 +1,748 @@ #!/bin/sh -# $RedRiver: update_openbsd,v 1.2 2008/08/12 22:07:05 andrew Exp $ +# $AFresh1: update_openbsd,v 1.103 2017/12/11 02:50:09 andrew Exp $ +# +# Copyright (c) 2012 Andrew Fresh +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# -SYSMERGE=/usr/sbin/sysmerge -MIRROR=ftp://ftp.openbsd.org/pub/OpenBSD -FTP_CMD='ftp -V' -DESTDIR=/ - -if [ -e /etc/update_openbsd.conf ]; then - . /etc/update_openbsd.conf -fi - -if [ -e ${HOME}/.update_openbsdrc ]; then - . ${HOME}/.update_openbsdrc -fi - installed_sets() { - misc=/usr/share/doc/README - man=/usr/share/man/cat1/intro.0 - comp=/usr/bin/cc - game=/usr/games/ - xbase=/usr/X11R6/ - xetc=/etc/X11/xinit/xinitrc - xfont=/usr/X11R6/lib/X11/fonts - xserv=/usr/X11R6/bin/X - xshare=/usr/X11R6/bin/startx + local misc=/usr/share/doc/README + local man=/usr/share/man/man1/intro.1 + local comp=/usr/bin/cc + local game=/usr/games/ + local xbase=/usr/X11R6/ + local xetc=/etc/X11/xinit/xinitrc + local xfont=/usr/X11R6/lib/X11/fonts + local xserv=/usr/X11R6/bin/X + local xshare=/usr/X11R6/bin/startx - echo base - echo etc + local _nv=`echo $NEW_VER | sed -e 's/\.//'` + local _c _d _e + echo -n base + [ $_nv -lt 57 ] && echo -n ' etc' for _d in misc man comp game xbase xetc xfont xserv xshare; do + [ $_d = xetc -a $_nv -ge 57 ] && continue eval _e=\$${_d} _c=`ls $_e 2> /dev/null | wc -l` #echo $_c $_d $_e if [ $_c -ne 0 ]; then - echo $_d + echo -n " $_d" fi done + + sendmail -d0.1 --badoption /dev/null | grep -q SASL + if [ $? == 0 ]; then + echo -n ' sendmail-smtp_auth' + 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 + + if [ X"ftp" == X"${_proto}" ]; then + local _list=`echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/` + _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'` + + elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then + _file=`${FTP_CMD} -V -o - ${FTP}/index.txt | + sed -ne 's/.*\(base[0-9][0-9].tgz\).*/\1/p'` + + elif [ X"scp" == X"${_proto}" ]; then + echo SCP is not yet supported >&2 + return 2 + + else + echo Unsupported FTP ${FTP} >&2 + return 2 + + fi + + local _v=${_file##*base} + _v=${_v%.tgz*} + echo $_v +} + +set_boot_device() { + BOOT_DEVICE=$( df -nP /bsd | sed -ne 's! .*/$!!p' ) + + root_disk=$( echo $BOOT_DEVICE | + sed -e 's,/dev/\([a-z]*[0-9]\)[a-z].*,\1,' ) + msdos_partition=$( + fdisk $root_disk | grep -q '^*.*FAT32' \ + && \ + disklabel $root_disk | sed -ne 's/:.*MSDOS//p' | tr -d ' ' + ) + + [ "$msdos_partition" ] && + BOOT_DEVICE="/dev/$root_disk$msdos_partition" +} + +boot_device_mounted="" +mount_boot_device() { + [ "$boot_device_mounted" ] && return + + local default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' ) + local boot_mount=$( mount | + sed -ne "s!^$BOOT_DEVICE on \([^ ]*\).*!\1!p" ) + + if [ ! "$boot_mount" ]; then + mount $BOOT_DEVICE /mnt + boot_device_mounted=1 + KERNEL_ROOT=/mnt + elif [ "$boot_mount" != "$default_mount" ]; then + KERNEL_ROOT=$boot_mount/ + else + KERNEL_ROOT=${default_mount%/}/ + fi +} + +umount_boot_device() { + [ "$boot_device_mounted" ] && umount $BOOT_DEVICE + boot_device_mounted="" +} + +find_boot_kernel() { + local _k=$( ( \ + echo bsd; \ + [ -e boot.conf ] && sed -E '/^ *(set +image|boot) +/!d ; \ + s///; s/^.*://; s/ .*$//' boot.conf \ + ) | tail -1 ) + _k=$( follow_symlink $_k ) + + local _d=$( dirname $_k ) + [ "$_d" = "." ] && _d=$PWD + + if [ $_d = . -o $_d = $PWD ]; then + basename $_k + else + echo $_k + fi +} + set_version() { CUR_VER=`uname -r` NEW_VER=`dc -e "$CUR_VER 0.1 + p"` + FILE_VER="" + FTP="" - if [ -d $NEW_VER ]; then - DIR=$NEW_VER - fi + local _cv=`echo $CUR_VER | sed -e 's/\.//'` + local _nv=`echo $NEW_VER | sed -e 's/\.//'` + local _v - if [ -d $CUR_VER ]; then + if [ X"No" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then + _dir=$FORCE_DIR + if [ -e ${_dir}/base${_nv}.tgz ]; then + _v=$_nv + elif [ -e ${_dir}/base${_cv}.tgz ]; then + NEW_VER=$CUR_VER + _v=$_cv + fi + + elif [ -d $CUR_VER ]; then + _dir=$CUR_VER NEW_VER=$CUR_VER - DIR=$NEW_VER - fi + if [ -e ${_dir}/base${_cv}.tgz ]; then + _v=$_cv + fi - if [ X"" != X"$FORCE_DIR" ]; then - if [ -d $FORCE_DIR ]; then - DIR=$FORCE_DIR - - _cv=`echo $CUR_VER | sed -e 's/\.//'` - if [ -e $DIR/base${_cv}.tgz ]; then - NEW_VER=$CUR_VER - fi + elif [ -d $NEW_VER ]; then + _dir=$NEW_VER + if [ -e ${_dir}/base${_nv}.tgz ]; then + _v=$_nv fi + fi - if [ X"" == X"$DIR" ]; then - FTP=${MIRROR}/${NEW_VER}/`machine` + if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then + if [ X"No" != X"${FORCE_DIR}" ]; then + _dir=${FORCE_DIR} + elif sysctl kern.version | grep -q -- '-current '; then + _dir=snapshots + FORCE_DIR=snapshots + else + _dir=${NEW_VER} + fi + FTP=${MIRROR}/${_dir}/`machine` - #echo "ls\nquit\n" | ftp $MIRROR | grep "$NEW_VER" - $FTP_CMD ${FTP}/MD5 > /dev/null + _v=`version_in` - if [ -e MD5 ]; then - rm -f MD5 - else + if [ X"" == X"${_v}" ]; then + if [ X"No" != X"$FORCE_DIR" ]; then + echo No sets in forced [${FTP}] >&2 + return 2 + fi + NEW_VER=$CUR_VER + _dir=${NEW_VER} + FTP=${MIRROR}/${_dir}/`machine` + + _v=`version_in` fi - if [ X"$FORCE_DIR" == X"" ]; then - DIR=$NEW_VER + if [ X"" == X"${_v}" ]; then + echo No sets in [${FTP}] >&2 + return 2 + elif [ X"${_cv}" == X"${_v}" ]; then + NEW_VER=$CUR_VER + elif [ X"${_nv}" == X"${_v}" ]; then + NEW_VER=$NEW_VER else - DIR=$FORCE_DIR + echo Invalid version [$_v] >&2 + return 2 fi - FTP=${MIRROR}/${DIR}/`machine` + if [ X"No" == X"$FORCE_DIR" ]; then + _dir=$NEW_VER + fi + fi - if [ X"" != X"$RELEASEDIR" ]; then - DIR=$RELEASEDIR + if [ X"" == X"${_v}" ]; then + 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 - if [ -d $DIR ]; then - cd $DIR - RELEASEDIR=`pwd` + if [ X"" == X"$RELEASEDIR" ]; then + RELEASEDIR=`pwd`/$_dir fi - _v=`echo $NEW_VER | sed -e 's/\.//'` + FILE_VER=$_v + if [ X"" != X"${MIRROR}" ]; then + FTP=${MIRROR}/${_dir}/`machine` + fi + + KERNEL_ROOT="" + [ -z "$BOOT_DEVICE" ] && set_boot_device + + mount_boot_device + cd $KERNEL_ROOT + BOOT_KERNEL=$( find_boot_kernel ) + BOOT_KERNEL_VERSION=$( kernel_file_version $BOOT_KERNEL ) + cd $OLDPWD + umount_boot_device + + BOOTED_KERNEL_VERSION=`sysctl -n kern.version` + NEW_KERNEL_VERSION="" + + # We want to default to what we had + INSTALL_KERNELS="$BOOT_KERNEL" + # if the boot kernel was our specially named bsd.sp, we install from bsd + if [ X"$INSTALL_KERNELS" == X"bsd.sp" ]; then + INSTALL_KERNELS="bsd" + fi + # 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() { + echo '==> GETTING SETS' if [ X"" == X"$FTP" ]; then - echo Error, no FTP site is set! >&2 - exit 1 + echo ERROR: No FTP site set! >&2 + return 1 fi - if [ X"" == X"$RELEASEDIR" ]; then - RELEASEDIR=$DIR - fi - - mkdir -p $RELEASEDIR + mkdir -p ${RELEASEDIR} cd $RELEASEDIR - RELEASEDIR=`pwd` - for _b in /bsd* bsd bsd.mp bsd.rd; do - if [ -e /${_b} -a ! -e ./${_b} ]; then - echo $FTP_CMD ${FTP}/${_b} + local _v=$FILE_VER + + for _b in $INSTALL_KERNELS; do + if [ ! -e ./${_b} ]; then + echo "===> $FTP_CMD ${FTP}/${_b}" $FTP_CMD ${FTP}/${_b} + else + echo "===> Have ${_b}" fi + kernel_file_version "${_b}" done - for _s in `installed_sets`; do - echo $FTP_CMD ${FTP}/${_s}${_v}.tgz - $FTP_CMD ${FTP}/${_s}${_v}.tgz + for _s in $INSTALLED_SETS; do + [ "$_v" -ge "57" -a "$_s" != "${_s%etc}" ] && continue + local _file=${_s}${_v}.tgz + if [ ${_s} == sendmail-smtp_auth ]; then + _file=${_s}.gz + fi + + if [ ! -e ./${_file} ]; then + echo "===> $FTP_CMD ${FTP}/${_file}" + $FTP_CMD ${FTP}/${_file} + fi done - echo $FTP_CMD ${FTP}/MD5 - $FTP_CMD ${FTP}/MD5 - ls bsd* *.tgz > index - grep -f index MD5 | md5 -c + local _type + local _ftp + for _type in $CHECKSUM_TYPES; do + [ -e $_type ] && break + _ftp=`echo "$FTP" | sed -e 's,://[^/]*/,://ftp.openbsd.org/,'` + echo "===> $FTP_CMD ${_ftp}/$_type" + $FTP_CMD ${_ftp}/$_type + done +} - if [ $? -ne 0 ]; then - echo !!! WARNING: MD5 does not match !!! >&2 - exit 1 +follow_symlink () { + local _file=$1 + # This could go circular, but I dunno how to fix that. + if [ -h $_file ]; then + follow_symlink $( readlink -f $_file ) + else + echo $_file fi } -install_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 +check_sum () { + local _type=$1 + echo "==> CHECKING $_type SUMS" + cd $RELEASEDIR + + if [ ! -e $_type ]; then + echo $_type File does not exist! + return 1 fi - if [ X"" == X"$RELEASEDIR" ]; then - echo "ERROR: no source for new kernels!" >&2 - exit 1 + 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 - cd $RELEASEDIR + grep -f index $_type | sha256 -c fi - if [ ! -e bsd ]; then - echo "new bsd kernel does not exist!" >&2 - exit 1 + if [ $? -ne 0 ]; then + echo ERROR: $_type does not match! >&2 + return 1 fi +} - if [ -e /bsd.mp -a ! -e bsd.mp ]; then - echo "new bsd.mp kernel does not exist!" >&2 - exit 1 +check_sets() { + echo '==> CHECKING SETS' + cd $RELEASEDIR + + local _missing_sets + local _v=$FILE_VER + + mount_boot_device + for _n in $INSTALL_KERNELS; do + local _o=$_n + [ X"bsd" == X"${_o}" -a -e ${KERNEL_ROOT}bsd.sp ] && _o=bsd.sp + if [ -e ${KERNEL_ROOT}${_o} -a ! -e ./${_n} ]; then + echo ${_o} does not exist on $BOOT_DEVICE + _missing_sets=1 + fi + + if [ X"${BOOT_KERNEL}" == X"${_o}" -a -e ./${_n} ]; then + NEW_KERNEL_VERSION=`kernel_file_version ./${_n}` + fi + done + umount_boot_device + + if [ X"$NEW_KERNEL_VERSION" == X"" ]; then + echo Missing replacement for boot kernel $BOOT_KERNEL >&2 + _missing_sets=1 fi - if [ ! -e bsd.rd ]; then - echo "new bsd.rd kernel does not exist!" >&2 - exit 1 + for _s in $INSTALLED_SETS; do + [ "$_v" -ge "57" -a "$_s" != "${_s%etc}" ] && continue + local _file=${_s}${_v}.tgz + if [ ${_s} == sendmail-smtp_auth ]; then + _file=${_s}.gz + fi + if [ ! -e ./${_file} ]; then + echo ${_file} does not exist + _missing_sets=1 + fi + done + + if [ X"" == X"${_missing_sets}" ]; then + echo 'All OK' fi + local _type + for _type in $CHECKSUM_TYPES; do + [ -n "$NO_SIGNIFY" -a "$_type" != "${_type%.sig}" ] && continue + if [ -e $_type ]; then + check_sum $_type && break + [ -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1 + fi + done - if [ -e base${_v}.tgz ]; then - echo Extracting new firmware from base${_v}.tgz - $SUDO tar -C $DESTDIR -xzphf base${_v}.tgz "*etc/firmware/*" + return 0 +} + + +install_kernels() { + local _d=$1 + local default_mount + local boot_mount + local mount_is_msdos + + if [ ! "$_d" ]; then + default_mount=$( df -lnP /bsd | sed -ne 's!/dev/.* !!p' ) + mount_boot_device + + if [ "$KERNEL_ROOT" != "$default_mount" ]; then + local _ik="$INSTALL_KERNELS" + INSTALL_KERNELS="$BOOT_KERNEL bsd.rd" + + install_kernels $KERNEL_ROOT + + INSTALL_KERNELS="$_ik" + fi + + umount_boot_device + + install_kernels $default_mount + return fi - $SUDO rm -f /obsd - $SUDO ln /bsd /obsd - if [ $? -ne 0 ]; then - echo "Error copying old kernel!" + echo "==> INSTALLING KERNEL to $_d" + + if [ X"" == X"$RELEASEDIR" ]; then + echo ERROR: no source for new kernels! >&2 exit 1 fi - for _b in bsd*; do - $SUDO rm -f /nbsd + [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1 - 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: Couldn't copy new SP kernel!" >&2 - exit 1 - fi + if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then + echo "===> Backing up $BOOT_KERNEL to ${_d}obsd" + if [ $mount_is_msdos ]; then + cp $BOOT_KERNEL ${_d}obsd else - if [ -e /$_b ]; then - echo Copying $_b to / - $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b} - if [ $? -ne 0 ]; then - echo "ERROR: Couldn't copy new $_b kernel!" >&2 - exit 1 - fi - fi + ln -f $BOOT_KERNEL ${_d}obsd fi - done - - if [ ! -h /bsd ]; then - 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 + if [ $? -ne 0 ]; then + echo "Error copying old kernel!" >&2 + exit 1 fi + fi + + cd $RELEASEDIR + + for _b in $INSTALL_KERNELS; do + rm -f ${_d}nbsd + local _bd=$_b + [ X"${_b}" == X"bsd" ] && _bd="bsd.sp" + + local _is_boot="" + [ X"$BOOT_KERNEL" == X"${_d}${_bd}" ] && _is_boot="# boot kernel" + + echo "Copying $_b to ${_d}$_bd $_is_boot" + cp ${_b} ${_d}nbsd && mv ${_d}nbsd ${_d}${_bd} if [ $? -ne 0 ]; then - echo "ERROR: Couldn't symlink new kernel!" >&2 + echo ERROR: Could not copy new $_bd kernel! >&2 exit 1 fi + done + + cd $OLDPWD + + if [ ! -h ${_d}bsd ]; then + cd ${_d} + for _b in $BOOT_KERNELS; do + [ X"$_b" == X"bsd" ] && _b="bsd.sp" + if [ -e $_b ]; then + if [ "$mount_is_msdos" ]; then + echo "===> Moving $_b ${_d}bsd (MSDOS)" + mv -f ${_b} bsd + else + echo "===> symlinking $_b to ${_d}bsd" + ln -sf $_b bsd + fi + break + fi + done + cd $OLDPWD fi } install_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 + echo '==> INSTALLING SETS' if [ X"" == X"$RELEASEDIR" ]; then - echo "ERROR: no source for sets!" >&2 + echo ERROR: no source for sets! >&2 exit 1 else cd $RELEASEDIR fi - for _f in *${_v}.tgz; do + local _v=$FILE_VER + + local _sets=`ls *${_v}.tgz | grep -v ^base ` + for _f in ${_sets} base${_v}.tgz; do _path=$DESTDIR if [ X"etc${_v}.tgz" == X"$_f" \ -o X"xetc${_v}.tgz" == X"$_f" ]; then - if [ X"" != X"$SYSMERGE" ]; then - continue - fi + [ X"" != X"$SYSMERGE" ] && continue _path=/var/tmp/temproot fi - echo Extracting $_f to $_path - $SUDO mkdir -p $_path - $SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f} + echo "Extracting $_f to $_path" + mkdir -p $_path + tar -C $_path -xzphf ${RELEASEDIR}/${_f} if [ $? -ne 0 ]; then - echo "Error extracting ${_f}!" >&2 + echo ERROR: Could not extract ${_f}! >&2 exit 1 fi done - echo Extracted all sets. + echo '===> Extracted all sets.' } +install_sendmail_smtp_auth() { + if [ -e ${RELEASEDIR}/sendmail-smtp_auth.gz ]; then + gzcat ${RELEASEDIR}/sendmail-smtp_auth.gz > \ + ${RELEASEDIR}/sendmail-smtp_auth + fi + if [ -e ${RELEASEDIR}/sendmail-smtp_auth ]; then + if ! pkg_info -qe 'cyrus-sasl-*'; then + pkg_add -i cyrus-sasl + fi + + install -o root -g smmsp -m 2555 \ + ${RELEASEDIR}/sendmail-smtp_auth \ + /usr/libexec/sendmail/sendmail + + echo '===> Installed sendmail with smtp_auth' + fi +} + update_etc() { - if [ X"" == X"$SYSMERGE" ]; then - if [ -e /var/tmp/temproot ]; then - MERGEMASTER=`which mergemaster` + echo '==> UPDATING ETC' + if [ ! -e $SYSMERGE ]; then + echo "ERROR: Can't find sysmerge!" >&2 + exit 1; + fi - if [ $? != 0 ]; then - $SUDO pkg_add -i mergemaster - MERGEMASTER=`which mergemaster` - if [ $? != 0 ]; then - echo ERROR: mergemaster not installed! >&2 - exit 1 - fi - fi + local _v=$FILE_VER + local _args="" - echo '### RUNNING MERGEMASTER ###' - $SUDO $MERGEMASTER -irv - else - echo "ERROR: no source for etc!" >&2 - exit 1 - fi - else + if [ ! -e /var/sysmerge/etc.tgz ]; then if [ X"" == X"$RELEASEDIR" ]; then echo "ERROR: no source for etc!" >&2 exit 1 - else - cd $RELEASEDIR fi - _cv=`echo $CUR_VER | sed -e 's/\.//'` - if [ -e etc${_cv}.tgz ]; then - _args="$_args -s etc${_cv}.tgz" + cd $RELEASEDIR + + if [ -e etc${_v}.tgz ]; then + _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz" fi - if [ -e xetc${_cv}.tgz ]; then - _args="$_args -x xetc${_cv}.tgz" + if [ -e xetc${_v}.tgz ]; then + _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" fi - if [ X"" == X"$_args" ]; then + if [ X"" == X"$_args" ]; then echo ERROR: No upgrade sets found! >&2 - else - echo '### RUNNING SYSMERGE ###' - _args="-a $_args" - $SUDO $SYSMERGE $_args + exit 1 fi fi + + echo '==> RUNNING SYSMERGE' + $SYSMERGE $_args + + cd $OLDPWD } -PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} -if [ X"" != X"$SYSMERGE" ]; then - if [ ! -e $SYSMERGE ]; then - SYSMERGE= - fi +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 + +if [ -e ${HOME}/.update_openbsdrc ]; then + . ${HOME}/.update_openbsdrc +fi + +MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD} +FTP_CMD=${FTP_CMD:=ftp -V} + +DESTDIR=${DESTDIR:=/} +SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} +FORCE_DIR=${FORCE_DIR:=No} + +export PKG_PATH TRUSTED_PKG_PATH + set_version +TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all} +if [ "$FORCE_DIR" = "No" ]; then + PKG_PATH=${PKG_PATH:=${MIRROR}/$NEW_VER/packages/`machine -a`} +else + PKG_PATH=${PKG_PATH:=${MIRROR}/$FORCE_DIR/packages/`machine -a`} +fi + +INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} + +CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256} + +local _error=$? + echo echo "-= update_openbsd - helper script to update OpenBSD =-" echo "------------------------------------------------------" echo -echo " DIR: $DIR" -echo "RELEASEDIR: $RELEASEDIR" -echo " DESTDIR: $DESTDIR" -echo " CUR_VER: $CUR_VER" -echo " NEW_VER: $NEW_VER" -echo " SUDO: $SUDO" -echo " SYSMERGE: $SYSMERGE" -echo " MIRROR: $MIRROR" +echo " SYSMERGE: $SYSMERGE" +echo " MIRROR: $FTP" +echo " PKG_PATH: $PKG_PATH" +echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH" +echo " RELEASEDIR: $RELEASEDIR" +echo " DESTDIR: $DESTDIR" +echo " BOOT_DEVICE: $BOOT_DEVICE" +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 -if [ X"" == X"$RELEASEDIR" ]; then - echo '### GETTING SETS ###' +mount_boot_device +for k in $INSTALL_KERNELS; do + if [ -e $KERNEL_ROOT$k ]; then + echo "Existing $BOOT_DEVICE:$k" + kernel_file_version $KERNEL_ROOT$k + fi +done +umount_boot_device + +if [ ${_error} -ne 0 ]; then + exit ${_error} +fi + +if [ X"" != X"${FTP}" ]; then get_sets 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 +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 + NEW_KERNEL_VERSION=$BOOT_KERNEL_VERSION +fi -echo '### INSTALLING KERNEL ###' -install_kernel +if [ X"$NEW_KERNEL_VERSION" != X"$BOOTED_KERNEL_VERSION" ]; then + echo >&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 "!!! doas MAY NOT WORK after sets are extracted. !!!" >&2 + echo >&2 + echo "enter to continue, ctrl+C to cancel" >&2 + local _temp + read _temp -if [ $CUR_VER == $NEW_VER -o X"" != X"$FORCE_DIR" ]; then - echo '### INSTALLING SETS ###' - install_sets + 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 +fi - echo '### UPDATING ETC ###' +install_kernels +install_sets + +if [ X"$NEW_KERNEL_VERSION" == X"$BOOTED_KERNEL_VERSION" ]; then + install_sendmail_smtp_auth + + if [ -e /sbin/oreboot ]; then + echo Removing /sbin/oreboot + rm -f /sbin/oreboot + fi update_etc - echo '### UPDATING PACKAGES ###' - $SUDO pkg_add -ui -F update -F updatedepends + OPENUP=$( which openup 2>/dev/null ) + if [ -n "$OPENUP" ]; then + echo "==> UPDATING WITH $OPENUP" + $OPENUP + else + echo '==> UPDATING PACKAGES' + pkg_add -u + fi + echo '==> UPDATING FIRMWARE' + fw_update + else - echo Instructions for updating to the new version available from - echo " http://www.openbsd.org/faq/upgrade${_v}.html" + [ -e /etc/rc.sysmerge ] && grep -q $SYSMERGE /etc/rc.sysmerge || + echo "$SYSMERGE -b" >>/etc/rc.sysmerge && + echo "==> RUNNING $SYSMERGE -b ON REBOOT" + + echo Instructions for updating to the new version available from + 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! +echo Update complete. enter to reboot, ctrl+C to cancel +read _temp +if [ -e /sbin/oreboot ]; then + echo using /sbin/oreboot + /sbin/oreboot +else + /sbin/reboot +fi