openbsd/update_openbsd/update_openbsd - diff

Return to update_openbsd CVS log

Up to [local] / openbsd / update_openbsd

Diff for /openbsd/update_openbsd/update_openbsd between version 1.79 and 1.96

version 1.79, 2015/11/03 03:56:53

version 1.96, 2017/12/10 21:20:53

Line 1

#!/bin/sh

# $AFresh1: update_openbsd,v 1.78 2015/10/11 23:35:14 andrew Exp $

# $AFresh1: update_openbsd,v 1.95 2017/12/10 21:19:11 andrew Exp $

# Permission to use, copy, modify, and distribute this software for any

Line 42

done

sendmail -d0.1 --badoption </dev/null 2>/dev/null | grep -q SASL

if [ $? == 0 ]; then

echo -n ' sendmail-smtp_auth'

}

Line 60

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}" ]; then

elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then

local _list=`${FTP_CMD} -V -o - ${FTP}/`

_file=`${FTP_CMD} -V -o - ${FTP}/index.txt |

_file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ {

sed -ne 's/.*$base[0-9][0-9].tgz$.*/\1/p'`

sub("^.*base","base");

sub("\.tgz.*",".tgz");

print $0;

}'`

elif [ X"scp" == X"${_proto}" ]; then

echo SCP is not yet supported >&2

return 2

else

echo Unsupported FTP ${FTP} >&2

return 2

Line 118

Line 114

if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then

if [ X"No" == X"${FORCE_DIR}" ]; then

if [ X"No" != X"${FORCE_DIR}" ]; then

_dir=${NEW_VER}

else

_dir=${FORCE_DIR}

elif sysctl kern.version | grep -q -- '-current '; then

_dir=snapshots

FORCE_DIR=snapshots

else

_dir=${NEW_VER}

FTP=${MIRROR}/${_dir}/`machine`

Line 142

Line 141

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

Line 275

Line 274

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

Line 339

Line 338

done

if [ X"" == X"${_missing_sets}" ]; then

echo '===> All OK'

echo 'All OK'

local _type

Line 381

Line 380

local _is_boot=""

[ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"

echo "===> Copying $_b to /$_bd $_is_boot"

echo "Copying $_b to /$_bd $_is_boot"

cp ${_b} /nbsd && mv /nbsd /${_bd}

if [ $? -ne 0 ]; then

echo ERROR: Could not copy new $_bd kernel! >&2

Line 431

Line 430

_path=/var/tmp/temproot

echo "===> Extracting $_f to $_path"

echo "Extracting $_f to $_path"

mkdir -p $_path

tar -C $_path -xzphf ${RELEASEDIR}/${_f}

if [ $? -ne 0 ]; then

Line 471

Line 470

local _v=$FILE_VER

local _args=""

if [ ! -e /usr/share/sysmerge/etc.tgz ]; then

if [ ! -e /var/sysmerge/etc.tgz ]; then

if [ X"" == X"$RELEASEDIR" ]; then

echo "ERROR: no source for etc!" >&2

exit 1

Line 485

Line 484

if [ -e xetc${_v}.tgz ]; then

_args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz"

if [ X"" == X"$_args" ]; then

echo ERROR: No upgrade sets found! >&2

exit 1

Line 511

Line 510

. ${HOME}/.update_openbsdrc

#MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD}

MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD}

FTP_CMD=${FTP_CMD:=ftp -V}

PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}

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`}

INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}

CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}

Line 531

Line 538

echo "-= update_openbsd - helper script to update OpenBSD =-"

echo "------------------------------------------------------"

echo

echo " SYSMERGE: $SYSMERGE"

echo " MIRROR: $MIRROR"

echo " MIRROR: $FTP"

echo " RELEASEDIR: $RELEASEDIR"

echo " PKG_PATH: $PKG_PATH"

echo " DESTDIR: $DESTDIR"

echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"

echo " BOOT_KERNEL: $BOOT_KERNEL"

echo " RELEASEDIR: $RELEASEDIR"

echo "INSTALL_KERNELS: $INSTALL_KERNELS"

echo " DESTDIR: $DESTDIR"

echo " INSTALLED_SETS: $INSTALLED_SETS"

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

for k in $INSTALL_KERNELS; do

Line 580

Line 589

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

Line 611

Line 620

update_etc

OPENUP=$( which openup )

OPENUP=$( which openup 2>/dev/null )

if [ -n "$OPENUP" ]; then

echo "==> UPDATING WITH $OPENUP"

$OPENUP

else

echo '==> UPDATING PACKAGES'

pkg_add -ui -F update -F updatedepends

pkg_add -u

echo '==> UPDATING FIRMWARE'

fw_update

else

echo Instructions for updating to the new version available from

[ -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

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>